[mapserver-commits] r12854 - trunk/mapserver

[svn at osgeo.org]

Author: tbonfort
Date: 2011-12-06 07:13:32 -0800 (Tue, 06 Dec 2011)
New Revision: 12854

Modified:
   trunk/mapserver/maprendering.c
Log:
un-comment out code accidentally removed during SVG symbol commit


Modified: trunk/mapserver/maprendering.c
===================================================================
--- trunk/mapserver/maprendering.c	2011-12-06 14:45:28 UTC (rev 12853)
+++ trunk/mapserver/maprendering.c	2011-12-06 15:13:32 UTC (rev 12854)
@@ -628,16 +628,16 @@
     * this behavior is kind of a mapfile hack, and must be
     * kept for backwards compatibility
     */
-//   if (symbolset->symbol[style->symbol]->type != MS_SYMBOL_PIXMAP) {
-//      if (!MS_VALID_COLOR(style->color)) {
-//         if(MS_VALID_COLOR(style->outlinecolor))
-//            return msDrawLineSymbol(symbolset, image, p, style, scalefactor);
-//         else {
-//            /* just do nothing if no color has been set */
-//            return MS_SUCCESS;
-//         }
-//      }
-//   }
+   if (symbolset->symbol[style->symbol]->type != MS_SYMBOL_PIXMAP && symbolset->symbol[style->symbol]->type != MS_SYMBOL_SVG ) {
+      if (!MS_VALID_COLOR(style->color)) {
+         if(MS_VALID_COLOR(style->outlinecolor))
+            return msDrawLineSymbol(symbolset, image, p, style, scalefactor);
+         else {
+            /* just do nothing if no color has been set */
+            return MS_SUCCESS;
+         }
+      }
+   }
    if (image)
    {
       if (MS_RENDERER_PLUGIN(image->format)) {