Changeset 14767

Timestamp:

06/25/08 10:12:03 (5 months ago)

Author:

ilucena

Message:

Fix #2444 (lat/long) and #2442 (uppercase file extension)

Files:

• trunk/gdal/frmts/idrisi/IdrisiDataset.cpp (modified) (9 diffs)

trunk/gdal/frmts/idrisi/IdrisiDataset.cpp

@@ -58 +58 @@
-#define extSMP          "smp"
-#define extREF          "ref"
+#define extRSTu         "RST"
+#define extRDCu         "RDC"
+#define extSMPu         "SMP"
+#define extREFu         "REF"
-
-//----- field names on rdc file:
@@ -117 +121 @@
-#define rstMETER        "m"
-#define rstLATLONG      "latlong"
+#define rstLATLONG2     "lat/long"
-#define rstPLANE        "plane"
-#define rstUTM          "utm-%d%c"
@@ -440 +445 @@
-    if( ! FileExists( pszLDocFilename ) )
-    {
-
+
+
+
+
+
+
-    }
-
@@ -1081 +1091 @@
-    const char *pszAssociated;
-        
+    // --------------------------------------------------------------------
+    //      Symbol table file
+    // --------------------------------------------------------------------
+
-    pszAssociated = CPLResetExtension( pszFilename, extSMP );
-
@@ -1087 +1101 @@
-        papszFileList = CSLAddString( papszFileList, pszAssociated );
-    }
+    else
+    {
+        pszAssociated = CPLResetExtension( pszFilename, extSMPu );
+
+        if( FileExists( pszAssociated ) )
+        {
+            papszFileList = CSLAddString( papszFileList, pszAssociated );
+        }
+    }
+
+    // --------------------------------------------------------------------
+    //      Documentation file
+    // --------------------------------------------------------------------
-
-    pszAssociated = CPLResetExtension( pszFilename, extRDC );
@@ -1094 +1121 @@
-        papszFileList = CSLAddString( papszFileList, pszAssociated );
-    }
+    else
+    {
+        pszAssociated = CPLResetExtension( pszFilename, extRDCu );
+
+        if( FileExists( pszAssociated ) )
+        {
+            papszFileList = CSLAddString( papszFileList, pszAssociated );
+        }
+    }
+
+    // --------------------------------------------------------------------
+    //      Reference file
+    // --------------------------------------------------------------------
-
-    pszAssociated = CPLResetExtension( pszFilename, extREF );
@@ -1100 +1140 @@
-    {
-        papszFileList = CSLAddString( papszFileList, pszAssociated );
+    }
+    else
+    {
+        pszAssociated = CPLResetExtension( pszFilename, extREFu );
+
+        if( FileExists( pszAssociated ) )
+        {
+            papszFileList = CSLAddString( papszFileList, pszAssociated );
+        }
-    }
-
@@ -2098 +2147 @@
-    // ---------------------------------------------------------
-
-
+
+
-    {
-        oSRS.SetWellKnownGeogCS( "WGS84" );
@@ -2172 +2222 @@
-
-        const char *pszIdrisiDir = CPLGetConfigOption( "IDRISIDIR", NULL );
+
-        if( ( pszIdrisiDir ) != NULL )
-        {