[mapserver-commits] r13232 - trunk/mapserver

[svn at osgeo.org]

Author: tbonfort
Date: 2012-03-12 09:10:18 -0700 (Mon, 12 Mar 2012)
New Revision: 13232

Modified:
   trunk/mapserver/mapsymbol.c
Log:
fix pixmap symbol loading with label styles


Modified: trunk/mapserver/mapsymbol.c
===================================================================
--- trunk/mapserver/mapsymbol.c	2012-03-12 10:53:46 UTC (rev 13231)
+++ trunk/mapserver/mapsymbol.c	2012-03-12 16:10:18 UTC (rev 13232)
@@ -659,6 +659,10 @@
   }
   
   symbol = symbolset->symbol[style->symbol];
+  if (symbol->type == MS_SYMBOL_PIXMAP && !symbol->pixmap_buffer) {
+      if (MS_SUCCESS != msPreloadImageSymbol(MS_MAP_RENDERER(symbolset->map), symbol))
+         return MS_FAILURE;
+  }
   if(style->size == -1) {
       size = ( msSymbolGetDefaultSize(symbol) * scalefactor );
   }
@@ -681,10 +685,6 @@
 #endif
 
   case(MS_SYMBOL_PIXMAP): 
-    if (!symbol->pixmap_buffer) {
-       if (MS_SUCCESS != msPreloadImageSymbol(MS_MAP_RENDERER(symbolset->map), symbol))
-          return MS_FAILURE;
-    }
     if(size == 1) {        
       *width = MS_MAX(*width, symbol->pixmap_buffer->width);
       *height = MS_MAX(*height, symbol->pixmap_buffer->height);