comparison data/model/PowerOfSqrtTwoZoomConstraint.cpp @ 383:94fc0591ea43 1.2-stable

* merge from trunk (1.2 ended up being tracked from trunk, but we may want
  this branch for fixes later)

 	    base = (((unsigned int)((1 << minCachePower) * sqrt(2) + 0.01))
 		    << (power - minCachePower));
 	}
 
 //	std::cerr << "Testing base " << base << std::endl;
-	if (base >= blockSize) {
+
+        if (base == blockSize) {
+            result = base;
+            break;
+        }
+
+	if (base > blockSize) {
 	    if (dir == RoundNearest) {
 		if (base - blockSize < blockSize - prevBase) {
 		    dir = RoundUp;
 		} else {
 		    dir = RoundDown;