Mercurial > hg > svcore
diff data/model/PowerOfSqrtTwoZoomConstraint.h @ 929:59e7fe1b1003 warnfix_no_size_t
Unsigned removals and warning fixes in data/
author | Chris Cannam |
---|---|
date | Tue, 17 Jun 2014 14:33:42 +0100 |
parents | 0ed2b2e26b44 |
children | d4a28d1479a8 48e9f538e6e9 |
line wrap: on
line diff
--- a/data/model/PowerOfSqrtTwoZoomConstraint.h Tue Jun 17 13:52:07 2014 +0100 +++ b/data/model/PowerOfSqrtTwoZoomConstraint.h Tue Jun 17 14:33:42 2014 +0100 @@ -21,17 +21,17 @@ class PowerOfSqrtTwoZoomConstraint : virtual public ZoomConstraint { public: - virtual size_t getNearestBlockSize(size_t requestedBlockSize, + virtual int getNearestBlockSize(int requestedBlockSize, RoundingDirection dir = RoundNearest) const; - virtual size_t getNearestBlockSize(size_t requestedBlockSize, + virtual int getNearestBlockSize(int requestedBlockSize, int &type, int &power, RoundingDirection dir = RoundNearest) const; - virtual size_t getMinCachePower() const { return 6; } + virtual int getMinCachePower() const { return 6; } }; #endif