Changeset 11340

Timestamp:

04/23/07 16:14:06 (2 years ago)

Author:

warmerdam

Message:

improve iBandDim selection for EOS_GRID (bug 1331)

Files:

• trunk/gdal/frmts/hdf4/hdf4imagedataset.cpp (modified) (3 diffs)

trunk/gdal/frmts/hdf4/hdf4imagedataset.cpp

@@ -407 +407 @@
-                {
-                    CPLError( CE_Failure, CPLE_AppDefined, 
-GD
+SW
-                    eErr = CE_Failure;
-                }
@@ -2168 +2168 @@
-                        }
-                    }
-
-                    if ( i == nDimCount )
-                            poDS->nBands = poDS->aiDimSizes[0];
-                }
-
@@ -2180 +2177 @@
-                for ( i = 0; i < nDimCount; i++ )
-                {
-
+
+
-                        poDS->iXDim = i;
-
+
+
-                        poDS->iYDim = i;
+                }
+
+                // If didn't get a band dimension yet, but have an extra
+                // dimension, use it as the band dimension. 
+
+                if( poDS->iRank > 2 && poDS->iBandDim == -1 )
+                {
+                    if( poDS->iXDim != 0 && poDS->iYDim != 0 )
+                        poDS->iBandDim = 0;
+                    else if( poDS->iXDim != 1 && poDS->iYDim != 1 )
+                        poDS->iBandDim = 1;
+                    else if( poDS->iXDim != 2 && poDS->iYDim != 2 )
+                        poDS->iBandDim = 2;
+
+                    poDS->nBands = poDS->aiDimSizes[poDS->iBandDim];
-                }
-