Changeset 12325

Timestamp:

10/04/07 16:10:53 (9 months ago)

Author:

warmerdam

Message:

Various updates for ENVI format driver. Includes support for RPC
metadata and NoData?? value, new unit types (ticket #1730). Also some
minor bug fixes, including fatal error when ENVI header contains
colormap that is missing elements and rejection of Meta File, Virtual
Mosaic, and Spectral library types which cannot be read.
(from Bruce Payne)

Files:

• sandbox/warmerdam/1.4-esri/gdal/frmts/raw/envidataset.cpp (modified) (14 diffs)

sandbox/warmerdam/1.4-esri/gdal/frmts/raw/envidataset.cpp

@@ -228 +228 @@
-    int         ReadHeader( FILE * );
-    int         ProcessMapinfo( const char * );
+    void        ProcessRPCinfo( const char * );
-    void        SetENVIDatum( OGRSpatialReference *, const char * );
-    void        SetENVIEllipse( OGRSpatialReference *, char ** );
@@ -948 +949 @@
-    {
-        CPLError( CE_Warning, CPLE_AppDefined,
- 
+, pszENVIDatumName
-        poSRS->SetWellKnownGeogCS( "WGS84" );
-    }
@@ -1141 +1142 @@
-        if( osDatumName.find_first_of("abcdefghijklmnopqrstuvwxyz"
-                                      "ABCDEFGHIJKLMNOPQRSTUVWXYZ") 
-                          
+
-        {
-            SetENVIDatum( &oSRS, osDatumName );
@@ -1155 +1156 @@
-/*      Try to process specialized units.                               */
-/* -------------------------------------------------------------------- */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-/* -------------------------------------------------------------------- */
-/*      Turn back into WKT.                                             */
@@ -1188 +1213 @@
-    CSLDestroy( papszPI );
-    return TRUE;
+}
+
+/************************************************************************/
+/*                           ProcessRPCinfo()                           */
+/*                                                                      */
+/*      Extract RPC transformation coefficients if they are present     */
+/*      and sets into the standard metadata fields for RPC.             */
+/************************************************************************/
+
+void ENVIDataset::ProcessRPCinfo( const char *pszRPCinfo )
+{
+    char        **papszFields;
+    char    sVal[1280];
+    int         nCount;
+
+    papszFields = SplitList( pszRPCinfo );
+    nCount = CSLCount(papszFields);
+
+    if( nCount < 90 )
+    {
+        CSLDestroy( papszFields );
+        return;
+    }
+        
+    snprintf(sVal, sizeof(sVal),  "%.16f",atof(papszFields[0]));
+    SetMetadataItem("RPC_LINE_OFF",sVal);
+    snprintf(sVal, sizeof(sVal),  "%.16f",atof(papszFields[5]));
+    SetMetadataItem("RPC_LINE_SCALE",sVal);
+    snprintf(sVal, sizeof(sVal),  "%.16f",atof(papszFields[1]));
+    SetMetadataItem("RPC_SAMP_OFF",sVal);
+    snprintf(sVal, sizeof(sVal),  "%.16f",atof(papszFields[6]));
+    SetMetadataItem("RPC_SAMP_SCALE",sVal);
+    snprintf(sVal, sizeof(sVal),  "%.16f",atof(papszFields[2]));
+    SetMetadataItem("RPC_LAT_OFF",sVal);
+    snprintf(sVal, sizeof(sVal),  "%.16f",atof(papszFields[7]));
+    SetMetadataItem("RPC_LAT_SCALE",sVal);
+    snprintf(sVal, sizeof(sVal),  "%.16f",atof(papszFields[3]));
+    SetMetadataItem("RPC_LONG_OFF",sVal);
+    snprintf(sVal, sizeof(sVal),  "%.16f",atof(papszFields[8]));
+    SetMetadataItem("RPC_LONG_SCALE",sVal);
+    snprintf(sVal, sizeof(sVal),  "%.16f",atof(papszFields[4]));
+    SetMetadataItem("RPC_HEIGHT_OFF",sVal);
+    snprintf(sVal, sizeof(sVal),  "%.16f",atof(papszFields[9]));
+    SetMetadataItem("RPC_HEIGHT_SCALE",sVal);
+
+    sVal[0] = '\0'; 
+    for(int i = 0; i < 20; i++ )
+       snprintf(sVal+strlen(sVal), sizeof(sVal),  "%.16f ", 
+           atof(papszFields[10+i]));
+    SetMetadataItem("RPC_LINE_NUM_COEFF",sVal);
+
+    sVal[0] = '\0'; 
+    for(int i = 0; i < 20; i++ )
+       snprintf(sVal+strlen(sVal), sizeof(sVal),  "%.16f ",
+           atof(papszFields[30+i]));
+    SetMetadataItem("RPC_LINE_DEN_COEFF",sVal);
+      
+    sVal[0] = '\0'; 
+    for(int i = 0; i < 20; i++ )
+       snprintf(sVal+strlen(sVal), sizeof(sVal),  "%.16f ",
+           atof(papszFields[50+i]));
+    SetMetadataItem("RPC_SAMP_NUM_COEFF",sVal);
+      
+    sVal[0] = '\0'; 
+    for(int i = 0; i < 20; i++ )
+       snprintf(sVal+strlen(sVal), sizeof(sVal),  "%.16f ",
+           atof(papszFields[70+i]));
+    SetMetadataItem("RPC_SAMP_DEN_COEFF",sVal);
+        
+    snprintf(sVal, sizeof(sVal), "%.16f", 
+        atof(papszFields[3]) - atof(papszFields[8]) / 2.0 );
+    SetMetadataItem("RPC_MIN_LONG",sVal);
+
+    snprintf(sVal, sizeof(sVal), "%.16f", 
+        atof(papszFields[3]) + atof(papszFields[8]) / 2.0 );
+    SetMetadataItem("RPC_MAX_LONG",sVal);
+
+    snprintf(sVal, sizeof(sVal), "%.16f",
+        atof(papszFields[2]) - atof(papszFields[7]) / 2.0 );
+    SetMetadataItem("RPC_MIN_LAT",sVal);
+
+    snprintf(sVal, sizeof(sVal), "%.16f",
+        atof(papszFields[2]) + atof(papszFields[7]) / 2.0 );
+    SetMetadataItem("RPC_MAX_LAT",sVal);
+
-}
-
@@ -1396 +1506 @@
-    if( nLines == 0 || nSamples == 0 || nBands == 0 || pszInterleave == NULL )
-    {
+        delete poDS;
-        CPLError( CE_Failure, CPLE_AppDefined, 
-                  "The file appears to have an associated ENVI header, but\n"
@@ -1454 +1565 @@
-
-          default:
+            delete poDS;
-            CPLError( CE_Failure, CPLE_AppDefined, 
-                      "The file has a 'data type' value of '%s'.  This value\n"
@@ -1479 +1591 @@
-
-/* -------------------------------------------------------------------- */
+/*      Warn about unsupported file types virtual mosaic and meta file.*/
+/* -------------------------------------------------------------------- */
+    if( CSLFetchNameValue(poDS->papszHeader,"file_type" ) != NULL )
+    {
+        const char * pszEnviFileType;
+        pszEnviFileType = CSLFetchNameValue(poDS->papszHeader,"file_type");
+        if(!EQUAL(pszEnviFileType, "ENVI Standard") &&
+           !EQUAL(pszEnviFileType, "ENVI Classification"))
+        {
+            delete poDS;
+            CPLError( CE_Failure, CPLE_OpenFailed, 
+                      "File %s contains an invalid file type in the ENVI .hdr\n"
+                      "GDAL does not support '%s' type files.",
+                      poOpenInfo->pszFilename, pszEnviFileType );
+            return NULL;
+        }
+    }
+
+/* -------------------------------------------------------------------- */
-/*      Warn about compressed datasets.                                 */
-/* -------------------------------------------------------------------- */
@@ -1486 +1617 @@
-            != 0 )
-        {
-
+
+
-                      "File %s is marked as compressed in the ENVI .hdr\n"
-                      "GDAL does not support auto-decompression of ENVI data\n"
-
-
+
-                      poOpenInfo->pszFilename );
+            return NULL;
-        }
-    }
@@ -1512 +1644 @@
-    if( poDS->fpImage == NULL )
-    {
+            delete poDS;
-        CPLError( CE_Failure, CPLE_OpenFailed, 
-                  "Failed to re-open %s within ENVI driver.\n", 
-                  poOpenInfo->pszFilename );
-        delete poDS;
-        return NULL;
-    }
@@ -1549 +1681 @@
-    else
-    {
+            delete poDS;
-        CPLError( CE_Failure, CPLE_AppDefined, 
-                  "The interleaving type of the file (%s) is not supported.",
-                  pszInterleave );
-    
+       
-    }
-    
@@ -1606 +1739 @@
-        int nColorValueCount = CSLCount(papszClassColors);
-        GDALColorTable oCT;
-
-
+
++2
-        {
-            GDALColorEntry sEntry;
@@ -1623 +1756 @@
-        poDS->GetRasterBand(1)->SetColorInterpretation( GCI_PaletteIndex );
-    }
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-/* -------------------------------------------------------------------- */
-    if( CSLFetchNameValue( poDS->papszHeader, "map_info" ) != NULL )
@@ -1632 +1775 @@
-            poDS->ProcessMapinfo( 
-                CSLFetchNameValue(poDS->papszHeader,"map_info") );
+    }
+
+/* -------------------------------------------------------------------- */
+/*      Look for RPC mapinfo                                            */
+/* -------------------------------------------------------------------- */
+    if( CSLFetchNameValue( poDS->papszHeader, "rpc_info" ) != NULL )
+    {
+                poDS->ProcessRPCinfo( 
+                        CSLFetchNameValue(poDS->papszHeader,"rpc_info") );
-    }
-