Changeset 14671

Timestamp:

06/09/08 10:44:18 (6 months ago)

Author:

dron

Message:

More fixes for MrSID 7.x DSDK. See http://trac.osgeo.org/gdal/ticket/2410
for details.

Files:

• branches/1.5/gdal/frmts/mrsid/mrsiddataset.cpp (modified) (4 diffs)

branches/1.5/gdal/frmts/mrsid/mrsiddataset.cpp

@@ -1262 +1262 @@
-    MrSIDDataset        *poDS;
-    const LTFileSpec    oFileSpec( poOpenInfo->pszFilename );
+    LT_STATUS           eStat;
-
-    poDS = new MrSIDDataset();
@@ -1269 +1270 @@
-    else
-#endif
+    {
+#if defined(LTI_SDK_MAJOR) && LTI_SDK_MAJOR >= 7
+        poDS->poImageReader = MrSIDImageReader::create();
+        eStat = poDS->poImageReader->initialize( oFileSpec, true );
+#else
-        poDS->poImageReader = new LTIDLLReader<MrSIDImageReader>( oFileSpec, false );
-
-
+
+
+
+
+
+
-    {
-        delete poDS;
@@ -1285 +1295 @@
-    poDS->poMetadata = new LTIDLLCopy<LTIMetadataDatabase>(
-        poDS->poImageReader->getMetadata() );
-#if defined(LTI_SDK_MAJOR) && LTI_SDK_MAJOR >= 7
-    {
-        poDS->poImageReader = MrSIDImageReader::create();
-    }
-
-    eStat = poDS->poImageReader->initialize( &poDS->oStream, NULL );
-#else
-    const GUInt32       iNumRecs = poDS->poMetadata->getIndexCount();
-    GUInt32             i;
@@ -1298 +1301 @@
-    {
-        const LTIMetadataRecord *poMetadataRec = NULL;
-#endif
-
-        if ( LT_SUCCESS(poDS->poMetadata->getDataByIndex(i, poMetadataRec)) )
-        {