(svn r10070) -Fix: fix the rounding problem of zoom-levels in zoom.hpp, so it is global for every call
This commit is contained in:
@@ -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 */
|
||||
|
Reference in New Issue
Block a user