[mapserver-commits] r9906 - branches/branch-5-6/mapserver

[svn at osgeo.org]

Author: warmerdam
Date: 2010-02-27 16:18:48 -0500 (Sat, 27 Feb 2010)
New Revision: 9906

Modified:
   branches/branch-5-6/mapserver/HISTORY.TXT
   branches/branch-5-6/mapserver/mapgraticule.c
Log:
fix crash with GRID layers with no classes (#3352)

Modified: branches/branch-5-6/mapserver/HISTORY.TXT
===================================================================
--- branches/branch-5-6/mapserver/HISTORY.TXT	2010-02-27 21:16:03 UTC (rev 9905)
+++ branches/branch-5-6/mapserver/HISTORY.TXT	2010-02-27 21:18:48 UTC (rev 9906)
@@ -15,6 +15,8 @@
 Current Version (SVN branch-5-6):
 --------------------------------
 
+- Fix crash with GRID layers with no classes (#3352)
+
 - Avoid memory error when building SQL bbox (#3324)
 
 - Determine PgSQL version in a more backwards compatible way (#3291)

Modified: branches/branch-5-6/mapserver/mapgraticule.c
===================================================================
--- branches/branch-5-6/mapserver/mapgraticule.c	2010-02-27 21:16:03 UTC (rev 9905)
+++ branches/branch-5-6/mapserver/mapgraticule.c	2010-02-27 21:18:48 UTC (rev 9906)
@@ -79,8 +79,11 @@
   pInfo->dwhichlatitude = -90.0;
   pInfo->dwhichlongitude = -180.0;
   pInfo->bvertical = 1;
-  
-  if( layer->class[0]->label.size == -1 )
+
+  if( layer->numclasses == 0 )
+      msDebug( "GRID layer has no classes, nothing will be rendered.\n" );
+
+  if( layer->numclasses == 0 || layer->class[0]->label.size == -1 )
     pInfo->blabelaxes = 0;
   else
     pInfo->blabelaxes = 1;