comparison data/model/PowerOfSqrtTwoZoomConstraint.cpp @ 689:573d45e9487b

Merge from debug-output branch

 	size_t rval;
 	if (dir == RoundUp) rval = size_t(val + 0.01);
 	else if (dir == RoundDown) rval = size_t(prevVal + 0.01);
 	else if (val - blockSize < blockSize - prevVal) rval = size_t(val + 0.01);
 	else rval = size_t(prevVal + 0.01);
-//	std::cerr << "returning " << rval << std::endl;
+//	DEBUG << "returning " << rval << endl;
 	return rval;
     }
 
     unsigned int prevBase = (1 << minCachePower);
     unsigned int prevPower = minCachePower;

 	} else {
 	    base = (((unsigned int)((1 << minCachePower) * sqrt(2.) + 0.01))
 		    << (power - minCachePower));
 	}
 
-//	std::cerr << "Testing base " << base << std::endl;
+//	DEBUG << "Testing base " << base << endl;
 
         if (base == blockSize) {
             result = base;
             break;
         }