[mapserver-commits] r10407 - sandbox/mapserver6

[svn at osgeo.org]

Author: tbonfort
Date: 2010-07-28 17:14:16 +0000 (Wed, 28 Jul 2010)
New Revision: 10407

Modified:
   sandbox/mapserver6/maprendering.c
Log:
remove superfluous tests


Modified: sandbox/mapserver6/maprendering.c
===================================================================
--- sandbox/mapserver6/maprendering.c	2010-07-28 13:02:55 UTC (rev 10406)
+++ sandbox/mapserver6/maprendering.c	2010-07-28 17:14:16 UTC (rev 10407)
@@ -632,22 +632,13 @@
          }
          switch (symbol->type) {
          case (MS_SYMBOL_TRUETYPE): {
-            if(!symbol->full_font_path)
-               symbol->full_font_path =  strdup(msLookupHashTable(&(symbolset->fontset->fonts),
-                     symbol->font));
-            if(!symbol->full_font_path) {
-               msSetError(MS_MEMERR,"allocation error", "msDrawMArkerSymbol()");
-               return MS_FAILURE;
-            }
+            assert(symbol->full_font_path);
             ret = renderer->renderTruetypeSymbol(image, p_x, p_y, symbol, &s);
 
          }
          break;
          case (MS_SYMBOL_PIXMAP): {
-            if(!symbol->pixmap_buffer) {
-               if(MS_SUCCESS != msPreloadImageSymbol(renderer,symbol))
-                  return MS_FAILURE;
-            }
+            assert(symbol->pixmap_buffer);
             ret = renderer->renderPixmapSymbol(image,p_x,p_y,symbol,&s);
          }
          break;