[mapserver-commits] r8924 - sandbox/graphics

[svn at osgeo.org]

Author: tamas
Date: 2009-04-19 05:23:40 -0400 (Sun, 19 Apr 2009)
New Revision: 8924

Modified:
   sandbox/graphics/maplabel.c
Log:
Fix unhandled exception in msAddLabel

Modified: sandbox/graphics/maplabel.c
===================================================================
--- sandbox/graphics/maplabel.c	2009-04-18 23:02:25 UTC (rev 8923)
+++ sandbox/graphics/maplabel.c	2009-04-19 09:23:40 UTC (rev 8924)
@@ -318,12 +318,6 @@
   classObj *classPtr=NULL;
 
   if(!string) return(MS_SUCCESS); /* not an error */ 
-  if(map->scaledenom > 0) {
-    if((label->maxscaledenom != -1) && (map->scaledenom >= label->maxscaledenom))
-        return(MS_SUCCESS);
-    if((label->minscaledenom != -1) && (map->scaledenom < label->minscaledenom))
-        return(MS_SUCCESS);
-  }
 
   layerPtr = (GET_LAYER(map, layerindex)); /* set up a few pointers for clarity */
   classPtr = GET_LAYER(map, layerindex)->class[classindex];
@@ -338,6 +332,13 @@
         return(MS_SUCCESS);
   }
 
+  if(map->scaledenom > 0) {
+    if((label->maxscaledenom != -1) && (map->scaledenom >= label->maxscaledenom))
+        return(MS_SUCCESS);
+    if((label->minscaledenom != -1) && (map->scaledenom < label->minscaledenom))
+        return(MS_SUCCESS);
+  }
+
   /* Validate label priority value and get ref on label cache for it */
   if (label->priority < 1)
       label->priority = 1;