Changeset 14005

Timestamp:

03/14/08 08:53:34 (4 months ago)

Author:

ilucena

Message:

Merged from trunk, no VSIMalloc2,3() and no GetFileList?()

Files:

• sandbox/warmerdam/1.4-esri/gdal/frmts/idrisi/IdrisiDataset.cpp (modified) (61 diffs)

sandbox/warmerdam/1.4-esri/gdal/frmts/idrisi/IdrisiDataset.cpp

@@ -34 +34 @@
-#include "ogr_spatialref.h"
-#include "gdal_pam.h"
+#include "gdal_alg.h"
-#include "gdal_rat.h"
-#include "gdal_alg.h"
-
-CPL_CVSID( "$Id$" );
@@ -114 +114 @@
-#define rstREAL         "real"
-#define rstRGB24        "rgb24"
-rees
-eters
+
+
-#define rstLATLONG      "latlong"
-#define rstPLANE        "plane"
@@ -198 +198 @@
-struct ConvertionTab {
-    const char *pszName;
-
+
+
-    double dfConv;
-};
@@ -204 +205 @@
-//----- Linear Unit Conversion Table
-static ConvertionTab aoLinearUnitsConv[] = {
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-};
-#define LINEAR_UNITS_COUNT (sizeof(aoLinearUnitsConv) / sizeof(ConvertionTab))
@@ -224 +239 @@
-
-//----- Get the defaut name
-
+
+
+
+
+
+
+
-
-//----- Classes pre-definition:
@@ -255 +276 @@
-
-    CPLErr Wkt2GeoReference( const char *pszProjString,
-onst c
-onst c
+
+
-
-protected:
@@ -323 +344 @@
-    virtual const GDALRasterAttributeTable *GetDefaultRAT();
-    virtual CPLErr SetDefaultRAT( const GDALRasterAttributeTable * );
+
+    float  dfMaximum;
+    float  dfMinimum;
+    bool   bFirstVal;
-};
-
@@ -363 +388 @@
-    {
-        if( eAccess == GA_Update )
-
+
+
+
+
+
+
+
+
+
-            CSLSetNameValueSeparator( papszRDC, ": " );
-            CSLSave( papszRDC, pszDocFilename );
+
+#ifndef WIN32        
+            FormatCRLF( pszDocFilename );
+#endif 
-        }
-        CSLDestroy( papszRDC );
@@ -371 +408 @@
-
-    if( poColorTable )
+    {
-        delete poColorTable;
-
+
-    CPLFree( pszFilename );
-    CPLFree( pszDocFilename );
@@ -463 +501 @@
-        poDS->SetBand( 1, new IdrisiRasterBand( poDS, 1, GDT_Byte ) );
-    }
-
+else 
-    {
-        poDS->nBands = 1;
-        poDS->SetBand( 1, new IdrisiRasterBand( poDS, 1, GDT_Int16 ) );
-    }
-
+else 
-    {
-        poDS->nBands = 1;
-        poDS->SetBand( 1, new IdrisiRasterBand( poDS, 1, GDT_Float32 ) );
-    }
-
+else 
-    {
-        poDS->nBands = 3;
@@ -479 +517 @@
-        poDS->SetBand( 2, new IdrisiRasterBand( poDS, 2, GDT_Byte ) );
-        poDS->SetBand( 3, new IdrisiRasterBand( poDS, 3, GDT_Byte ) );
+    }
+    else
+    {
+        CPLError(CE_Failure, CPLE_AppDefined,
+                 "Unknown data type : %s", pszDataType);
+        delete poDS;
+        return NULL;
+    }
+
+    int i;
+    for(i=0;i<poDS->nBands;i++)
+    {
+        IdrisiRasterBand* band = (IdrisiRasterBand*) poDS->GetRasterBand(i+1);
+        if (band->pabyScanLine == NULL)
+        {
+            delete poDS;
+            return NULL;
+        }
-    }
-
@@ -733 +789 @@
-    CSLSetNameValueSeparator( papszLRDC, ": " );
-    CSLSave( papszLRDC, pszLDocFilename );
+#ifndef WIN32        
+    FormatCRLF( pszLDocFilename );
+#endif 
-    CSLDestroy( papszLRDC );
-
@@ -750 +809 @@
-    }
-    VSIFCloseL( fp );
-
-    // --------------------------------------------------------------------
-    // Delete pre-existent .smp and .ref file with the same base name
-    // --------------------------------------------------------------------
-
-    const char *pszPalletFName = CPLResetExtension( pszFilename, extSMP );
-
-    if( FileExists( pszPalletFName ) )
-    {
-        VSIUnlink( pszPalletFName );
-    }
-
-    const char *pszRefereceFName = CPLResetExtension( pszFilename, extREF );
-
-    if( FileExists( pszRefereceFName ) )
-    {
-        VSIUnlink( pszRefereceFName );
-    }
-
-    return (IdrisiDataset *) GDALOpen( pszFilename, GA_Update );
@@ -814 +855 @@
-        GDALDataType eType = poSrcDS->GetRasterBand( i )->GetRasterDataType();
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-    }
@@ -837 +894 @@
-    GDALDataType eType = poBand->GetRasterDataType();
-
+        int bSuccessMin = FALSE;
+        int bSuccessMax = FALSE;
+
-    double dfMin;
-    double dfMax;
-
-
-
-
+
+
+
+
+
+
+
+
-
-    if(!( ( eType == GDT_Byte ) || 
@@ -907 +971 @@
-        if( poDS->nBands == 1 )
-        {
-            poBand->SetCategoryNames( poSrcBand->GetCategoryNames() );
-            poBand->SetColorTable( poSrcBand->GetColorTable() );
-            poBand->SetUnitType( poSrcBand->GetUnitType() );
-
-            // ------------------------------------------------------------
-            //      Copy Attribute Table information
-            // ------------------------------------------------------------
-
-            const GDALRasterAttributeTable *poRAT = poSrcBand->GetDefaultRAT();
+
-            if( poRAT != NULL )
-            {
-                poBand->SetDefaultRAT( poRAT );
-            }
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        dfNoDataValue = poSrcBand->GetNoDataValue( &bHasNoDataValue );
-        if( bHasNoDataValue )
@@ -939 +1009 @@
-    poDS->GetRasterBand( 1 )->GetBlockSize( &nBlockXSize, &nBlockYSize );
-
+    void *pData = VSIMalloc( nBlockXSize * nBlockYSize * 
+                              GDALGetDataTypeSize( eType ) / 8 );
+
+    if( pData == NULL )
+    {
+        CPLError( CE_Failure, CPLE_OutOfMemory,
+                "IdrisiRasterBand::CreateCopy : Out of memory " );
+        delete poDS;
+        return NULL;
+    }
+
-    for( int iBand = 1; iBand <= poSrcDS->GetRasterCount(); iBand++ )
-    {
@@ -945 +1026 @@
-
-        int    iYOffset, iXOffset;
-        void *pData;
-        CPLErr eErr = CE_None;
-
-        pData = CPLMalloc( nBlockXSize * nBlockYSize * GDALGetDataTypeSize( eType ) / 8 );
-
-        for( iYOffset = 0; iYOffset < nYSize; iYOffset += nBlockYSize )
@@ -980 +1058 @@
-            }
-        }
-
-
+
+
+
-
-    // --------------------------------------------------------------------
@@ -1079 +1158 @@
-    CPLErr eResult = CE_None;
-
-onst char *pszRefSystem
-onst char *pszRefUnit
+har *pszRefSystem = NULL
+har *pszRefUnit = NULL
-
-    eResult = Wkt2GeoReference( pszProjString, &pszRefSystem, &pszRefUnit );
@@ -1086 +1165 @@
-    CSLSetNameValue( papszRDC, rdcREF_SYSTEM, pszRefSystem );
-    CSLSetNameValue( papszRDC, rdcREF_UNITS,  pszRefUnit );
+
+    CPLFree( pszRefSystem );
+    CPLFree( pszRefUnit );
-
-    return eResult;
@@ -1102 +1184 @@
-    this->eDataType = eDataType;
-    this->poDefaultRAT = NULL;
+    this->dfMinimum = 0.0;
+    this->dfMaximum = 0.0;
+    this->bFirstVal = true;
-
-    // -------------------------------------------------------------------- 
@@ -1114 +1199 @@
-    // -------------------------------------------------------------------- 
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -1137 +1232 @@
-
-CPLErr IdrisiRasterBand::IReadBlock( int nBlockXOff, 
-
-
+ 
+ 
-{
-    IdrisiDataset *poGDS = (IdrisiDataset *) poDS;
@@ -1184 +1279 @@
-
-CPLErr IdrisiRasterBand::IWriteBlock( int nBlockXOff, 
-
-
+ 
+ 
-{
-    IdrisiDataset *poGDS = (IdrisiDataset *) poDS;
@@ -1229 +1324 @@
-    }
-
+    // -------------------------------------------------------------------- 
+    //      Store the first value as mimunm and maximum
+    // -------------------------------------------------------------------- 
+
+    if( bFirstVal )
+    {
+        switch( eDataType )
+        {
+            case GDT_Float32:
+                dfMinimum = dfMaximum = (double) ((float*) pabyScanLine)[0];
+                break;
+            case GDT_Int16:
+                dfMinimum = dfMaximum = (double) ((GInt16*) pabyScanLine)[0];
+                break;
+            default:
+                dfMinimum = dfMaximum = (double) ((GByte*) pabyScanLine)[ 
+                    poGDS->nBands == 1 ? 0 : 3 - this->nBand ];
+        }
+        bFirstVal = false;
+    }
+
+    // -------------------------------------------------------------------- 
+    //      Search for the minimum and maximum values
+    // -------------------------------------------------------------------- 
+
+    int i, j;
+
+    if( eDataType == GDT_Float32 )
+    {
+        for( i = 0; i < nBlockXSize; i++ )
+        {
+            dfMinimum = MIN( dfMinimum, ((float*) pabyScanLine)[i] );
+            dfMaximum = MAX( dfMaximum, ((float*) pabyScanLine)[i] );
+        }
+    }
+    else if( eDataType == GDT_Int16 )
+    {
+        for( i = 0; i < nBlockXSize; i++ )
+        {
+            dfMinimum = MIN( dfMinimum, ((GInt16*) pabyScanLine)[i] );
+            dfMaximum = MAX( dfMaximum, ((GInt16*) pabyScanLine)[i] );
+        }
+    }
+    else if( poGDS->nBands == 1 )
+    {
+        for( i = 0; i < nBlockXSize; i++ )
+        {
+            dfMinimum = MIN( dfMinimum, ((GByte*) pabyScanLine)[i] );
+            dfMaximum = MAX( dfMaximum, ((GByte*) pabyScanLine)[i] );
+        }
+    }
+    else
+    {
+        for( i = 0, j = ( 3 - nBand ); i < nBlockXSize; i++, j += 3 )
+        {
+            dfMinimum = MIN( dfMinimum, ((GByte*) pabyScanLine)[j] );
+            dfMaximum = MAX( dfMaximum, ((GByte*) pabyScanLine)[j] );
+        }
+    }
+
-    return CE_None;
-}
@@ -1245 +1400 @@
-
-    if( pbSuccess )
-
+
+
+
-
-    return adfMinValue[this->nBand - 1];
@@ -1263 +1420 @@
-
-    if( pbSuccess )
-
+
+
+
-
-    return adfMaxValue[this->nBand - 1];
@@ -1294 +1453 @@
-    {
-        dfNoData = atof_nz( CSLFetchNameValue( poGDS->papszRDC, rdcFLAG_VALUE ) );
-
+
+
-    }
-    else
-    {
-        dfNoData = -9999.0;    /* this value should be ignored */
-
+
+
-    }
-
@@ -1574 +1735 @@
-CPLErr IdrisiRasterBand::SetDefaultRAT( const GDALRasterAttributeTable *poRAT )
-{
+    if( ! poRAT )
+    {
+        return CE_Failure;
+    }
+
-    // ----------------------------------------------------------
-Update Bands Attribute Table
+Get field indecies
-    // ----------------------------------------------------------
-
+    int iValue = -1;
+    int iRed   = poRAT->GetColOfUsage( GFU_Red );
+    int iGreen = poRAT->GetColOfUsage( GFU_Green );
+    int iBlue  = poRAT->GetColOfUsage( GFU_Blue );
+    int iName  = poRAT->GetColOfUsage( GFU_Name );
+    int i;
+
+    // ----------------------------------------------------------
+    // Seek for "Value" field index (AGIS standards field name)
+    // ----------------------------------------------------------
+
+    if( iValue == -1 )
+    {
+        for( i = 0; i < poRAT->GetColumnCount(); i++ )
+        {
+            if EQUALN( "Value", poRAT->GetNameOfCol( i ), 5 ) 
+            {
+                iValue = i;
+                break;
+            }
+        }
+    }
+
+    /* if still can't find it use the first Integer column */
+
+    if( iValue == -1 )
+    {   
+        for( i = 1; i < poRAT->GetColumnCount(); i++ )
+        {
+            if( poRAT->GetTypeOfCol( i ) == GFT_Integer )
+            {
+                iValue = i;
+                break;
+            }
+        }
+    }
+
+    // ----------------------------------------------------------
+    // Seek for Name field index
+    // ----------------------------------------------------------
+
+    if( iName == -1 )
+    {
+        for( i = 0; i < poRAT->GetColumnCount(); i++ )
+        {
+            if EQUALN( "Class_Name", poRAT->GetNameOfCol( i ), 10 )
+            {
+                iName = i;
+                break;
+            } 
+            else if EQUALN( "Categor", poRAT->GetNameOfCol( i ), 7 )
+            {
+                iName = i;
+                break;
+            } 
+            else if EQUALN( "Name",  poRAT->GetNameOfCol( i ), 4 )
+            {
+                iName = i;
+                break;
+            }
+        }
+    }
+
+    /* if still can't find it use the first String column */
+
+    if( iName == -1 )
+    {   
+        for( i = 0; i < poRAT->GetColumnCount(); i++ )
+        {
+            if( poRAT->GetTypeOfCol( i ) == GFT_String )
+            {
+                iName = i;
+                break;
+            }
+        }
+    }
+
+    // ----------------------------------------------------------
+    // Incomplete Attribute Table;
+    // ----------------------------------------------------------
+
+    if( iName == -1 )
+    {
+        iName = iValue;
+    }
+
+    // ----------------------------------------------------------
+    // Initialization
+    // ----------------------------------------------------------
+
+    GDALColorTable *poCT = NULL;
+    char **papszNames = NULL;
+
+        double dRed     = 0.0;
+        double dGreen   = 0.0;
+        double dBlue    = 0.0;
+    int nFact       = 1;
+
+    if( iRed != -1 && iGreen != -1 && iBlue != -1 )
+    {
+        poCT  = new GDALColorTable();
+        nFact = poRAT->GetTypeOfCol( iRed ) == GFT_Real ? 255 : 1;
+    }
+
+    // ----------------------------------------------------------
+    // Load values
+    // ----------------------------------------------------------
+
+    GDALColorEntry  sColor;
+    int iEntry      = 0;
+    int iOut        = 0;
+    int nEntryCount = poRAT->GetRowCount();
+    int nValue      = poRAT->GetValueAsInt( iEntry, iValue );
+
+    for( iOut = 0; iOut < 65535 && ( iEntry < nEntryCount ); iOut++ )
+    {
+        if( iOut == nValue )
+        {
+            if( poCT )
+            {
+                            dRed    = poRAT->GetValueAsDouble( iEntry, iRed );
+                            dGreen  = poRAT->GetValueAsDouble( iEntry, iGreen );
+                            dBlue   = poRAT->GetValueAsDouble( iEntry, iBlue );
+                sColor.c1  = (short) ( dRed   * nFact );
+                sColor.c2  = (short) ( dGreen * nFact );
+                sColor.c3  = (short) ( dBlue  * nFact );
+                sColor.c4  = (short) ( 255    / nFact );    
+                poCT->SetColorEntry( iEntry, &sColor );
+            }
+            papszNames = CSLAddString( papszNames, 
+                poRAT->GetValueAsString( iEntry, iName ) );
+
+            /* Advance on the table */
+
+            if( ( ++iEntry ) < nEntryCount )
+            {
+                nValue = poRAT->GetValueAsInt( iEntry, iValue );
+            }
+        }
+        else if( iOut < nValue )
+        {
+            if( poCT )
+            {
+                sColor.c1  = (short) 0;
+                sColor.c2  = (short) 0;
+                sColor.c3  = (short) 0;
+                sColor.c4  = (short) 255;    
+                poCT->SetColorEntry( iEntry, &sColor );
+            }
+                papszNames = CSLAddString( papszNames, "" );
+        }
+        }
+
+    // ----------------------------------------------------------
+    // Set Color Table
+    // ----------------------------------------------------------
+
+    if( poCT )
+    {
+        SetColorTable( poCT );
+        delete poCT;
+    }
+
+    // ----------------------------------------------------------
+    // Update Category Names
+    // ----------------------------------------------------------
+
+    SetCategoryNames( papszNames );
+    CSLDestroy( papszNames );
+
+    // ----------------------------------------------------------
+    // Update Attribute Table
+    // ----------------------------------------------------------
+
-    if( poDefaultRAT ) 
-    {
@@ -1584 +1924 @@
-
-    poDefaultRAT = poRAT->Clone();
-
-    int nEntryCount = poDefaultRAT->GetRowCount();
-
-    // ----------------------------------------------------------
-    // Get the Color Table from the Attribute Table
-    // ----------------------------------------------------------
-
-    int iRed   = poDefaultRAT->GetColOfUsage( GFU_Red );
-    int iGreen = poDefaultRAT->GetColOfUsage( GFU_Green );
-    int iBlue  = poDefaultRAT->GetColOfUsage( GFU_Blue );
-
-    if( iRed != -1 && iGreen != -1 && iBlue != -1 )
-    {
-        GDALColorTable *poCT = new GDALColorTable();
-        int nEntryCount = poDefaultRAT->GetRowCount();
-        int iEntry = 0;
-
-        double dRed   = 0.0;   
-        double dGreen = 0.0;
-        double dBlue  = 0.0;
-
-        int nFact = poDefaultRAT->GetTypeOfCol( iRed ) == GFT_Real ? 255 : 1;
-
-        for( iEntry = 0; iEntry < nEntryCount; iEntry++ )
-        {
-            GDALColorEntry sColor;
-            int iRow = poDefaultRAT->GetRowOfValue( iEntry );
-
-            if( iRow == -1 )
-            {
-                iRow = iEntry; // This decision is questionable.
-            }
-
-            dRed   = poDefaultRAT->GetValueAsDouble( iRow, iRed );
-            dGreen = poDefaultRAT->GetValueAsDouble( iRow, iGreen );
-            dBlue  = poDefaultRAT->GetValueAsDouble( iRow, iBlue );
-
-            sColor.c1 = (short) ( dRed   * nFact );
-            sColor.c2 = (short) ( dGreen * nFact );
-            sColor.c3 = (short) ( dBlue  * nFact );
-            sColor.c4 = (short) ( 255    / nFact );
-            
-            poCT->SetColorEntry( iEntry, &sColor );
-        }
-
-        // ------------------------------------------------------
-        // Set Color Table
-        // ------------------------------------------------------
-
-        SetColorTable(poCT);
-        delete poCT;
-    }
-
-    // ----------------------------------------------------------
-    // Get the Catagory Names from the Attribute Table
-    // ----------------------------------------------------------
-
-    char **papszCategoryNames = NULL;
-
-    int iNameCol = poDefaultRAT->GetColOfUsage( GFU_Name );
-
-    if( iNameCol != -1 )
-    {
-        int iEntry = 0;
-        int iRow = 0;
-
-        for( iEntry = 0; iEntry < nEntryCount; iEntry++ )
-        {
-            iRow = poDefaultRAT->GetRowOfValue( iEntry );
-
-            if( iRow == -1 )
-            {
-                iRow = iEntry; // This decision is questionable.
-            }
-
-            papszCategoryNames = CSLAddString( papszCategoryNames, 
-                poDefaultRAT->GetValueAsString( iRow, iNameCol ) );
-        }
-    }
-
-    // ----------------------------------------------------------
-    // Update Header File
-    // ----------------------------------------------------------
-
-    SetCategoryNames( papszCategoryNames );
-    CSLDestroy( papszCategoryNames );
-
-    return CE_None;
@@ -1682 +1936 @@
-    IdrisiDataset *poGDS = (IdrisiDataset *) poDS;
-
-
-
+
-    {
-        return NULL;
-    }
+
+    bool bHasColorTable = poGDS->poColorTable->GetColorEntryCount() > 0;
-
-    // ----------------------------------------------------------
@@ -1700 +1955 @@
-
-    // ----------------------------------------------------------
-Set the Color Table to the Attribute Table
+Create (Value, Red, Green, Blue, Alpha, Class_Name) fields
-    // ----------------------------------------------------------
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-    // ----------------------------------------------------------
-Set the Catagory Names to the Attribute Table
+Loop throught the Category Names
-    // ----------------------------------------------------------
-
-
-
-
-
-
+
+
+
-    int iEntry = 0;
-
+s
-
-    for( iEntry = 0; iEntry < nEntryCount; iEntry++ )
-    {
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    return poDefaultRAT;
-}
@@ -1766 +2037 @@
-
-CPLErr IdrisiDataset::GeoReference2Wkt( const char *pszRefSystem,
-
-
+ 
+ 
-{
-    OGRSpatialReference oSRS;
@@ -1778 +2049 @@
-    {
-        oSRS.SetLocalCS( "Plane" );
-GetUnitDefault( pszRefUnits )
+pszRefUnits
-        if( nUnit > -1 )
-        {
-
-
+
+
+
-        }
-        oSRS.exportToWkt( pszProjString );
@@ -1837 +2109 @@
-            nZone = ( nZone == 1 ? nSPCode : nSPCode + nZone - 1 );
-
-
+ 
-            {
-                oSRS.exportToWkt( pszProjString );
@@ -1885 +2157 @@
-        {
-            oSRS.SetLocalCS( "Unknown" );
-GetUnitDefault( pszRefUnits )
+pszRefUnits
-            if( nUnit > -1 )
-            {
-
-
+
+
+
-            }
-        }
@@ -1903 +2176 @@
-    CSLSetNameValueSeparator( papszRef, ":" );
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-    double dfCenterLat          = atof_nz( CSLFetchNameValue( papszRef, refORIGIN_LAT ) );
-    double dfCenterLong         = atof_nz( CSLFetchNameValue( papszRef, refORIGIN_LONG ) );
@@ -2000 +2280 @@
-    {
-        oSRS.exportToWkt( pszProjString );
+        
+        CPLFree( pszGeorefName );
+        CPLFree( pszProjName );
+        CPLFree( pszDatum );
+        CPLFree( pszEllipsoid );
+        
-        return CE_None;
-    }
@@ -2050 +2336 @@
-    {
-        oSRS.SetProjection( pszProjName );
-Norm
-Norm
-Norm
-Norm
+
+
+
+
-    }
-    else if( EQUALN( pszProjName, "Lambert North Polar Azimuthal Equal Area", 15 ) ||
@@ -2092 +2378 @@
-        oSRS.Clear();
-        oSRS.exportToWkt( pszProjString );
+        
+        CPLFree( pszGeorefName );
+        CPLFree( pszProjName );
+        CPLFree( pszDatum );
+        CPLFree( pszEllipsoid );
+        
-        return CE_Warning;
-    }
@@ -2099 +2391 @@
-    // ----------------------------------------------------------------------
-
-GetUnitDefault( pszRefUnits )
+pszRefUnits
-    if( nUnit > -1 )
-    {
-
-
+
+
+
+
+
+
+
-    }
-
@@ -2113 +2410 @@
-
-    oSRS.exportToWkt( pszProjString );
+        
+    CPLFree( pszGeorefName );
+    CPLFree( pszProjName );
+    CPLFree( pszDatum );
+    CPLFree( pszEllipsoid );