[mapserver-commits] r9830 - trunk/mapserver

[svn at osgeo.org]

Author: warmerdam
Date: 2010-02-20 21:59:51 -0500 (Sat, 20 Feb 2010)
New Revision: 9830

Modified:
   trunk/mapserver/mapogr.cpp
Log:
change msMaybeAllocateStyle to msMaybeAllocateClassStyle to match the rest of the code and fix build error

Modified: trunk/mapserver/mapogr.cpp
===================================================================
--- trunk/mapserver/mapogr.cpp	2010-02-21 02:26:12 UTC (rev 9829)
+++ trunk/mapserver/mapogr.cpp	2010-02-21 02:59:51 UTC (rev 9830)
@@ -2789,7 +2789,7 @@
  * the only members we don't touch are name, expression, and join/query stuff
  * ------------------------------------------------------------------ */
   resetClassStyle(c);
-  if (msMaybeAllocateStyle(c, 0)) {
+  if (msMaybeAllocateClassStyle(c, 0)) {
       RELEASE_OGR_LOCK;
       return(MS_FAILURE);
   }
@@ -3119,7 +3119,7 @@
               {
                   // This is a multipart symbology, so pen defn goes in the
                   // overlaysymbol params 
-                  if (msMaybeAllocateStyle(c, 1))
+                  if (msMaybeAllocateClassStyle(c, 1))
                   {
                       RELEASE_OGR_LOCK;
                       return(MS_FAILURE);
@@ -3133,7 +3133,7 @@
               else
               {
                   // Single part symbology
-                  if (msMaybeAllocateStyle(c, 0))
+                  if (msMaybeAllocateClassStyle(c, 0))
                   {
                       RELEASE_OGR_LOCK;
                       return(MS_FAILURE);
@@ -3196,7 +3196,7 @@
               {
                   // This is a multipart symbology, so pen defn goes in the
                   // overlaysymbol params 
-                  if (msMaybeAllocateStyle(c, 1))
+                  if (msMaybeAllocateClassStyle(c, 1))
                   {
                       RELEASE_OGR_LOCK;
                       return(MS_FAILURE);
@@ -3210,7 +3210,7 @@
               else
               {
                   // Single part symbology
-                  if (msMaybeAllocateStyle(c, 0))
+                  if (msMaybeAllocateClassStyle(c, 0))
                   {
                       RELEASE_OGR_LOCK;
                       return(MS_FAILURE);
@@ -3239,7 +3239,7 @@
               if (bIsNull) pszBrushName = NULL;
 
               /* We need 1 style */
-              if (msMaybeAllocateStyle(c, 0))
+              if (msMaybeAllocateClassStyle(c, 0))
               {
                   RELEASE_OGR_LOCK;
                   return(MS_FAILURE);
@@ -3295,7 +3295,7 @@
               if (bIsNull) pszBrushName = NULL;
 
               /* We need 1 style */
-              if (msMaybeAllocateStyle(c, 0))
+              if (msMaybeAllocateClassStyle(c, 0))
               {
                   RELEASE_OGR_LOCK;
                   return(MS_FAILURE);
@@ -3343,7 +3343,7 @@
               OGRStyleToolH hSymbolStyle = hStylePart;
 
               /* We need 1 style */
-              if (msMaybeAllocateStyle(c, 0))
+              if (msMaybeAllocateClassStyle(c, 0))
               {
                   RELEASE_OGR_LOCK;
                   return(MS_FAILURE);
@@ -3397,7 +3397,7 @@
               OGRStyleSymbol *poSymbolStyle = (OGRStyleSymbol*)poStylePart;
 
               /* We need 1 style */
-              if (msMaybeAllocateStyle(c, 0))
+              if (msMaybeAllocateClassStyle(c, 0))
               {
                   RELEASE_OGR_LOCK;
                   return(MS_FAILURE);