Changeset 12304

Timestamp:

10/03/07 00:33:59 (1 year ago)

Author:

warmerdam

Message:

fix RRDNamesList growing (#1109)

Files:

• branches/1.4/gdal/frmts/hfa/hfaband.cpp (modified) (1 diff)
• branches/1.4/gdal/frmts/hfa/hfaentry.cpp (modified) (1 diff)
• branches/1.4/gdal/frmts/hfa/hfafield.cpp (modified) (1 diff)

branches/1.4/gdal/frmts/hfa/hfaband.cpp

@@ -1578 +1578 @@
-    // TODO: Need to add to end of array (thats pretty hard).
-    if( poRRDNamesList->SetStringField( szName, osLayerName ) != CE_None )
-
+
+
+
+
+
-
-/* -------------------------------------------------------------------- */

branches/1.4/gdal/frmts/hfa/hfaentry.cpp

@@ -303 +303 @@
-
-        MarkDirty();
+
+/* -------------------------------------------------------------------- */
+/*      If the data already had a file position, we now need to         */
+/*      clear that, forcing it to be rewritten at the end of the        */
+/*      file.  Referencing nodes will need to be marked dirty so        */
+/*      they are rewritten.                                             */
+/* -------------------------------------------------------------------- */
+        if( nFilePos != 0 )
+        {
+            nFilePos = 0;
+            if (poPrev != NULL) poPrev->MarkDirty(); 
+            if (poNext != NULL) poNext->MarkDirty(); 
+            if (poChild != NULL) poChild->MarkDirty(); 
+            if (poParent != NULL) poParent->MarkDirty(); 
+        }
-    }
-

branches/1.4/gdal/frmts/hfa/hfafield.cpp

@@ -664 +664 @@
-                                          nDataSize - nExtraOffset,
-                                          chReqType, pValue ) );
+            }
+            else
+            {
+                CPLAssert( FALSE );
+                return CE_Failure;
-            }
-        }