Changeset 19568

Timestamp:

Apr 28, 2010, 2:48:43 PM (14 years ago)

Author:

Even Rouault

Message:

RPFTOC: accept A.TOC files with frame entries that have same (row,col) coordinates (based on feedback from ​http://lists.osgeo.org/pipermail/mapserver-users/2010-April/065405.html)

File:

• trunk/gdal/frmts/nitf/rpftocfile.cpp (modified) (1 diff)

trunk/gdal/frmts/nitf/rpftocfile.cpp

@@ -423 +423 @@
         if (frameEntry->exists)
         {
-            CPLError( CE_Failure, CPLE_NotSupported, 
-                      "Invalid TOC file. Frame entry(%d,%d) for frame file index %d is a duplicate.",
+            CPLError( CE_Warning, CPLE_AppDefined, 
+                      "Frame entry(%d,%d) for frame file index %d was already found.",
                       frameRow, frameCol, i);
-            RPFTOCFree(toc);
-            return NULL;
+            CPLFree(frameEntry->directory);
+            frameEntry->directory = NULL;
+            CPLFree(frameEntry->fullFilePath);
+            frameEntry->fullFilePath = NULL;
+            frameEntry->exists = 0;
         }