[mapserver-commits] r10871 - trunk/mapserver

[svn at osgeo.org]

Author: assefa
Date: 2011-01-14 08:30:49 -0800 (Fri, 14 Jan 2011)
New Revision: 10871

Modified:
   trunk/mapserver/mapogcsld.c
Log:
SLD: Fix point symbolizer issue when color is not set (#3658)

Modified: trunk/mapserver/mapogcsld.c
===================================================================
--- trunk/mapserver/mapogcsld.c	2011-01-14 16:18:51 UTC (rev 10870)
+++ trunk/mapserver/mapogcsld.c	2011-01-14 16:30:49 UTC (rev 10871)
@@ -1750,21 +1750,21 @@
                         }
                     }
                     
-
-                     /* 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;
-                    }
+                }
+                /* 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;
+                  }
                     
-                }
+                
                 /* Get the corresponding symbol id  */
                 psStyle->symbol = msSLDGetMarkSymbol(map, pszSymbolName, 
                                                      bFilled, pszDashValue);