[mapserver-commits] r11248 - trunk/mapserver

[svn at osgeo.org]

Author: tbonfort
Date: 2011-03-18 10:20:25 -0700 (Fri, 18 Mar 2011)
New Revision: 11248

Modified:
   trunk/mapserver/mapscale.c
Log:
use default scalebar imagecolor if transparent set to off


Modified: trunk/mapserver/mapscale.c
===================================================================
--- trunk/mapserver/mapscale.c	2011-03-18 17:18:29 UTC (rev 11247)
+++ trunk/mapserver/mapscale.c	2011-03-18 17:20:25 UTC (rev 11248)
@@ -216,6 +216,10 @@
                        map->scalebar.interlace, 
                        MS_NOOVERRIDE );
 
+  if(map->scalebar.transparent == MS_OFF) {
+     if(!MS_VALID_COLOR(map->scalebar.imagecolor))
+        MS_INIT_COLOR(map->scalebar.imagecolor,255,255,255,255);
+  }
   image = msImageCreate(map->scalebar.width, sy, format,
           map->web.imagepath, map->web.imageurl, map->resolution, map->defresolution, &map->scalebar.imagecolor);