From 98c3056aa66b82817ab2dc4045c718de4dbaaf1a Mon Sep 17 00:00:00 2001 From: truelight Date: Fri, 8 Jun 2007 18:45:14 +0000 Subject: (svn r10070) -Fix: fix the rounding problem of zoom-levels in zoom.hpp, so it is global for every call --- src/gfx.cpp | 2 +- src/zoom.hpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/gfx.cpp b/src/gfx.cpp index a0812baed..d529728de 100644 --- a/src/gfx.cpp +++ b/src/gfx.cpp @@ -856,7 +856,7 @@ static inline void GfxBlitTileZoom(BlitterParams *bp) if (num <= 0) continue; } - num = UnScaleByZoom(num + ScaleByZoom(1, Tzoom) - 1, Tzoom); + num = UnScaleByZoom(num, Tzoom); switch (Tmode) { case BM_COLOUR_REMAP: diff --git a/src/zoom.hpp b/src/zoom.hpp index c80f094bf..500182d71 100644 --- a/src/zoom.hpp +++ b/src/zoom.hpp @@ -37,14 +37,14 @@ static inline int ScaleByZoom(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 << 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 */ -- cgit v1.2.3-70-g09d2