Changeset 14402

Timestamp:

05/09/08 01:20:49 (3 months ago)

Author:

rouault

Message:

Fix SGI driver that misidentified SRTMHGT files as SGI files (#2289)

Files:

• branches/1.5/gdal/frmts/sgi/sgidataset.cpp (modified) (1 diff)

branches/1.5/gdal/frmts/sgi/sgidataset.cpp

@@ -399 +399 @@
-        return NULL;
-
+    if (tmpImage.type != 0 && tmpImage.type != 1)
+        return NULL;
+
+    if (tmpImage.bpc != 1 && tmpImage.bpc != 2)
+        return NULL;
+
+    if (tmpImage.dim != 1 && tmpImage.dim != 2 && tmpImage.dim != 3)
+        return NULL;
+
-    if(tmpImage.bpc != 1)
-    {