[mapserver-commits] r7535 - trunk/mapserver

[svn at osgeo.org]

Author: pramsey
Date: 2008-04-26 19:41:46 -0400 (Sat, 26 Apr 2008)
New Revision: 7535

Modified:
   trunk/mapserver/mapshape.c
Log:
Ensure that msSHXRead* functions don't load pages once the AllLoaded flag is set.


Modified: trunk/mapserver/mapshape.c
===================================================================
--- trunk/mapserver/mapshape.c	2008-04-26 23:34:22 UTC (rev 7534)
+++ trunk/mapserver/mapshape.c	2008-04-26 23:41:46 UTC (rev 7535)
@@ -1133,7 +1133,7 @@
   if( hEntity < 0 || hEntity >= psSHP->nRecords )
     return(MS_FAILURE);
 
-  if( ! msGetBit(psSHP->panRecLoaded, shxBufferPage) ) {
+  if( ! (psSHP->panRecAllLoaded || msGetBit(psSHP->panRecLoaded, shxBufferPage)) ) {
     msSHXLoadPage( psSHP, shxBufferPage );
   }
 
@@ -1149,7 +1149,7 @@
   if( hEntity < 0 || hEntity >= psSHP->nRecords )
     return(MS_FAILURE);
 
-  if( ! msGetBit(psSHP->panRecLoaded, shxBufferPage) ) {
+  if( ! (psSHP->panRecAllLoaded || msGetBit(psSHP->panRecLoaded, shxBufferPage)) ) {
     msSHXLoadPage( psSHP, shxBufferPage );
   }