[mapserver-commits] r8596 - trunk/mapserver

[svn at osgeo.org]

Author: aboudreault
Date: 2009-02-19 10:00:49 -0500 (Thu, 19 Feb 2009)
New Revision: 8596

Modified:
   trunk/mapserver/mapogr.cpp
Log:
oops, last check for ogr label style properties

Modified: trunk/mapserver/mapogr.cpp
===================================================================
--- trunk/mapserver/mapogr.cpp	2009-02-19 14:53:09 UTC (rev 8595)
+++ trunk/mapserver/mapogr.cpp	2009-02-19 15:00:49 UTC (rev 8596)
@@ -2367,6 +2367,7 @@
           itemindexes[i] = MSOGR_LABELUNDERLINEINDEX;
       else if (EQUAL(layer->items[i], MSOGR_LABELPRIORITYNAME))
           itemindexes[i] = MSOGR_LABELPRIORITYINDEX;
+#if GDAL_VERSION_NUM >= 1400
       else if (EQUAL(layer->items[i], MSOGR_LABELSTRIKEOUTNAME))
           itemindexes[i] = MSOGR_LABELSTRIKEOUTINDEX;
       else if (EQUAL(layer->items[i], MSOGR_LABELSTRETCHNAME))
@@ -2375,7 +2376,6 @@
           itemindexes[i] = MSOGR_LABELADJHORINDEX;
       else if (EQUAL(layer->items[i], MSOGR_LABELADJVERTNAME))
           itemindexes[i] = MSOGR_LABELADJVERTINDEX;
-#if GDAL_VERSION_NUM >= 1400
       else if (EQUAL(layer->items[i], MSOGR_LABELHCOLORNAME))
           itemindexes[i] = MSOGR_LABELHCOLORINDEX;
 #endif /* GDAL_VERSION_NUM >= 1400 */