Mercurial > hg > svcore

diff data/model/PowerOfTwoZoomConstraint.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
line wrap: on
line diff
--- a/data/model/PowerOfTwoZoomConstraint.h	Tue Jun 03 11:05:49 2014 +0100
+++ b/data/model/PowerOfTwoZoomConstraint.h	Wed Jun 18 13:51:16 2014 +0100
@@ -21,7 +21,7 @@
 class PowerOfTwoZoomConstraint : virtual public ZoomConstraint
 {
 public:
-    virtual size_t getNearestBlockSize(size_t requestedBlockSize,
+    virtual int getNearestBlockSize(int requestedBlockSize,
 				       RoundingDirection dir = RoundNearest)
 	const;
 };