[mapserver-commits] r8555 - trunk/mapserver

[svn at osgeo.org]

Author: tamas
Date: 2009-02-15 12:43:35 -0500 (Sun, 15 Feb 2009)
New Revision: 8555

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/mapscale.c
Log:
Fixed a scalebar rounding problem causing to draw zero scalebar width (#2890)

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2009-02-15 14:28:20 UTC (rev 8554)
+++ trunk/mapserver/HISTORY.TXT	2009-02-15 17:43:35 UTC (rev 8555)
@@ -12,6 +12,8 @@
 Current Version (5.3-dev, SVN trunk):
 ------------------------------------
 
+- Fixed a scalebar rounding problem causing to draw zero scalebar width (#2890)
+
 - SLD: if it conatins a Filer Encoding tag, try to always set the
   layer's FILTER element (#2889)
 

Modified: trunk/mapserver/mapscale.c
===================================================================
--- trunk/mapserver/mapscale.c	2009-02-15 14:28:20 UTC (rev 8554)
+++ trunk/mapserver/mapscale.c	2009-02-15 17:43:35 UTC (rev 8555)
@@ -63,6 +63,10 @@
     return(MS_NINT(d/1000) * 1000);
   if(d<1000000)
     return(MS_NINT(d/10000) * 10000);
+  if(d<10000000)
+    return(MS_NINT(d/100000) * 100000);
+  if(d<100000000)
+    return(MS_NINT(d/1000000) * 1000000);
 
   return(-1);
 }