Mercurial > hg > svcore
diff data/model/PowerOfSqrtTwoZoomConstraint.cpp @ 847:2d53205f70cd tonioni
Merge from default branch
author | Chris Cannam |
---|---|
date | Tue, 26 Nov 2013 14:37:01 +0000 |
parents | e802e550a1f2 |
children | 59e7fe1b1003 |
line wrap: on
line diff
--- a/data/model/PowerOfSqrtTwoZoomConstraint.cpp Fri Nov 22 10:37:28 2013 +0000 +++ b/data/model/PowerOfSqrtTwoZoomConstraint.cpp Tue Nov 26 14:37:01 2013 +0000 @@ -34,7 +34,7 @@ int &power, RoundingDirection dir) const { -// std::cerr << "given " << blockSize << std::endl; +// cerr << "given " << blockSize << endl; size_t minCachePower = getMinCachePower();