diff data/model/PowerOfTwoZoomConstraint.cpp @ 935:f960d67ce842 tonioni

Merge from branch warnfix_no_size_t

--- a/data/model/PowerOfTwoZoomConstraint.cpp	Mon Jun 16 11:28:45 2014 +0100
+++ b/data/model/PowerOfTwoZoomConstraint.cpp	Wed Jun 18 13:42:01 2014 +0100
@@ -15,13 +15,13 @@
 
 #include "PowerOfTwoZoomConstraint.h"
 
-size_t
-PowerOfTwoZoomConstraint::getNearestBlockSize(size_t req,
+int
+PowerOfTwoZoomConstraint::getNearestBlockSize(int req,
 					      RoundingDirection dir) const
 {
-    size_t result = 0;
+    int result = 0;
 
-    for (size_t bs = 1; ; bs *= 2) {
+    for (int bs = 1; ; bs *= 2) {
 	if (bs >= req) {
 	    if (dir == RoundNearest) {
 		if (bs - req < req - bs/2) {