[mapserver-commits] r11932 - trunk/mapserver

[svn at osgeo.org]

Author: tamas
Date: 2011-07-14 05:21:34 -0700 (Thu, 14 Jul 2011)
New Revision: 11932

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/mapfile.c
Log:
Initialize the scalebar image color to transparent by default (#3957)

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2011-07-13 14:21:17 UTC (rev 11931)
+++ trunk/mapserver/HISTORY.TXT	2011-07-14 12:21:34 UTC (rev 11932)
@@ -15,6 +15,8 @@
 Current Version (SVN trunk, 6.1-dev, future 6.2): 
 -------------------------------------------------
 
+- Initialize the scalebar image color to transparent by default (#3957)
+
 IMPORTANT SECURITY FIX:
 
 -  Fixes to prevent SQL injections through OGC filter encoding (in WMS, WFS 

Modified: trunk/mapserver/mapfile.c
===================================================================
--- trunk/mapserver/mapfile.c	2011-07-13 14:21:17 UTC (rev 11931)
+++ trunk/mapserver/mapfile.c	2011-07-14 12:21:34 UTC (rev 11932)
@@ -4532,7 +4532,7 @@
 */
 void initScalebar(scalebarObj *scalebar)
 {
-  MS_INIT_COLOR(scalebar->imagecolor, 255,255,255,255);
+  MS_INIT_COLOR(scalebar->imagecolor, -1,-1,-1,255);
   scalebar->width = 200; 
   scalebar->height = 3;
   scalebar->style = 0; /* only 2 styles at this point */