# HG changeset patch
# User truelight
# Date 1181328314 0
# Node ID fa2e72e31f59c44a3b9503a07707b1f8923cf527
# Parent  290fdfc54179f63ac034ce0d653836e4d28c51d1
(svn r10070) -Fix: fix the rounding problem of zoom-levels in zoom.hpp, so it is global for every call

diff -r 290fdfc54179 -r fa2e72e31f59 src/gfx.cpp
--- a/src/gfx.cpp	Fri Jun 08 18:23:26 2007 +0000
+++ b/src/gfx.cpp	Fri Jun 08 18:45:14 2007 +0000
@@ -856,7 +856,7 @@
 				if (num <= 0) continue;
 			}
 
-			num = UnScaleByZoom(num + ScaleByZoom(1, Tzoom) - 1, Tzoom);
+			num = UnScaleByZoom(num, Tzoom);
 
 			switch (Tmode) {
 				case BM_COLOUR_REMAP:
diff -r 290fdfc54179 -r fa2e72e31f59 src/zoom.hpp
--- a/src/zoom.hpp	Fri Jun 08 18:23:26 2007 +0000
+++ b/src/zoom.hpp	Fri Jun 08 18:45:14 2007 +0000
@@ -37,14 +37,14 @@
 {
 	if (zoom == ZOOM_LVL_NORMAL) return value;
 	int izoom = (int)zoom - (int)ZOOM_LVL_NORMAL;
-	return (zoom > ZOOM_LVL_NORMAL) ? value << izoom : value >> -izoom;
+	return (zoom > ZOOM_LVL_NORMAL) ? value << izoom : (value + (1 << -izoom)) >> -izoom;
 }
 
 static inline int UnScaleByZoom(int value, ZoomLevel zoom)
 {
 	if (zoom == ZOOM_LVL_NORMAL) return value;
 	int izoom = (int)zoom - (int)ZOOM_LVL_NORMAL;
-	return (zoom > ZOOM_LVL_NORMAL) ? value >> izoom : value << -izoom;
+	return (zoom > ZOOM_LVL_NORMAL) ? (value + (1 << izoom) - 1) >> izoom : value << -izoom;
 }
 
 #endif /* ZOOM_HPP */