Mercurial > hg > svcore

diff base/ZoomConstraint.h @ 935:f960d67ce842 tonioni

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:42:01 +0100
parents 6a94bb528e9d
children 12f3b48668d4
line wrap: on
line diff
--- a/base/ZoomConstraint.h	Mon Jun 16 11:28:45 2014 +0100
+++ b/base/ZoomConstraint.h	Wed Jun 18 13:42:01 2014 +0100
@@ -48,7 +48,7 @@
      * summaries at powers-of-two block sizes, return 1024 or 2048
      * depending on the rounding direction supplied.
      */
-    virtual size_t getNearestBlockSize(size_t requestedBlockSize,
+    virtual int getNearestBlockSize(int requestedBlockSize,
 				       RoundingDirection = RoundNearest)
 	const
     {
@@ -59,7 +59,7 @@
     /**
      * Return the maximum zoom level within range for this constraint.
      */
-    virtual size_t getMaxZoomLevel() const { return 262144; }
+    virtual int getMaxZoomLevel() const { return 262144; }
 };
 
 #endif