Mercurial > hg > svcore

comparison data/model/PowerOfSqrtTwoZoomConstraint.h @ 936:0c1d6de8f44b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from branch warnfix_no_size_t
author Chris Cannam
date Wed, 18 Jun 2014 13:51:16 +0100
parents 59e7fe1b1003
children d4a28d1479a8 48e9f538e6e9
comparison
equal deleted inserted replaced
917:49618f39ff09 936:0c1d6de8f44b
19 #include "base/ZoomConstraint.h" 19 #include "base/ZoomConstraint.h"
20 20
21 class PowerOfSqrtTwoZoomConstraint : virtual public ZoomConstraint 21 class PowerOfSqrtTwoZoomConstraint : virtual public ZoomConstraint
22 { 22 {
23 public: 23 public:
24 virtual size_t getNearestBlockSize(size_t requestedBlockSize, 24 virtual int getNearestBlockSize(int requestedBlockSize,
25 RoundingDirection dir = RoundNearest) 25 RoundingDirection dir = RoundNearest)
26 const; 26 const;
27 27
28 virtual size_t getNearestBlockSize(size_t requestedBlockSize, 28 virtual int getNearestBlockSize(int requestedBlockSize,
29 int &type, 29 int &type,
30 int &power, 30 int &power,
31 RoundingDirection dir = RoundNearest) 31 RoundingDirection dir = RoundNearest)
32 const; 32 const;
33 33
34 virtual size_t getMinCachePower() const { return 6; } 34 virtual int getMinCachePower() const { return 6; }
35 }; 35 };
36 36
37 #endif 37 #endif
38 38