[mapserver-commits] r10870 - branches/branch-5-6/mapserver

[svn at osgeo.org]

Author: assefa
Date: 2011-01-14 08:18:51 -0800 (Fri, 14 Jan 2011)
New Revision: 10870

Modified:
   branches/branch-5-6/mapserver/HISTORY.TXT
   branches/branch-5-6/mapserver/mapogcsld.c
Log:
SLD: Fix point symbolizer issue when color is not set (#3658)

Modified: branches/branch-5-6/mapserver/HISTORY.TXT
===================================================================
--- branches/branch-5-6/mapserver/HISTORY.TXT	2011-01-14 15:51:55 UTC (rev 10869)
+++ branches/branch-5-6/mapserver/HISTORY.TXT	2011-01-14 16:18:51 UTC (rev 10870)
@@ -17,6 +17,8 @@
 Version 5.6.6 (SVN branch-5-6):
 -------------------------------
 
+- SLD: Fix point symbolizer issue when color is not set (#3658)
+
 - Fix WMS EXCEPTIONS parameter issue with fastcgi (#3525)
 
 - Fixed missing time in msDrawMap logging (#3651)

Modified: branches/branch-5-6/mapserver/mapogcsld.c
===================================================================
--- branches/branch-5-6/mapserver/mapogcsld.c	2011-01-14 15:51:55 UTC (rev 10869)
+++ branches/branch-5-6/mapserver/mapogcsld.c	2011-01-14 16:18:51 UTC (rev 10870)
@@ -1648,22 +1648,22 @@
                             psCssParam = psCssParam->psNext;
                         }
                     }
-                    
+                }
 
                      /* set the default color if color is not not already set */
-                    if ((psStyle->color.red < 0 || 
-                        psStyle->color.green == -1 ||
-                         psStyle->color.blue == -1) &&
-                        (psStyle->outlinecolor.red == -1 ||
-                         psStyle->outlinecolor.green == -1 ||
-                         psStyle->outlinecolor.blue == -1))
-                    {
-                        psStyle->color.red = 128;
-                        psStyle->color.green = 128;
-                        psStyle->color.blue = 128;
-                    }
+                if ((psStyle->color.red < 0 || 
+                     psStyle->color.green == -1 ||
+                     psStyle->color.blue == -1) &&
+                    (psStyle->outlinecolor.red == -1 ||
+                     psStyle->outlinecolor.green == -1 ||
+                     psStyle->outlinecolor.blue == -1))
+                  {
+                    psStyle->color.red = 128;
+                    psStyle->color.green = 128;
+                    psStyle->color.blue = 128;
+                  }
                     
-                }
+                
                 /* Get the corresponding symbol id  */
                 psStyle->symbol = msSLDGetMarkSymbol(map, pszSymbolName, 
                                                      bFilled, pszDashValue);