[mapserver-commits] r9685 - trunk/mapserver

[svn at osgeo.org]

Author: warmerdam
Date: 2010-01-13 00:06:59 -0500 (Wed, 13 Jan 2010)
New Revision: 9685

Modified:
   trunk/mapserver/mapogr.cpp
Log:
fix autostyling to work with RFC 52 implementation

Modified: trunk/mapserver/mapogr.cpp
===================================================================
--- trunk/mapserver/mapogr.cpp	2010-01-12 20:06:44 UTC (rev 9684)
+++ trunk/mapserver/mapogr.cpp	2010-01-13 05:06:59 UTC (rev 9685)
@@ -2777,12 +2777,13 @@
  * ------------------------------------------------------------------ */
   ACQUIRE_OGR_LOCK;
   if (psInfo->hLastFeature == NULL || 
-      OGR_F_GetFID( psInfo->hLastFeature ) != record)
+      psInfo->last_record_index_read != record)
   {
-      if (psInfo->hLastFeature)
-          OGR_F_Destroy( psInfo->hLastFeature );
-
-      psInfo->hLastFeature = OGR_L_GetFeature( psInfo->hLayer, record );
+      RELEASE_OGR_LOCK;
+      msSetError(MS_MISCERR, 
+                 "Assertion failed: AutoStyle not requested on loaded shape.",
+                 "msOGRLayerGetAutoStyle()");
+      return(MS_FAILURE);
   }
 
 /* ------------------------------------------------------------------