Changeset 13757

Timestamp:

02/11/08 12:07:39 (5 months ago)

Author:

ilucena

Message:

Force min/max calculation on IWriteBlock
Adopts the safer memory allocation functions VSIMalloc2/3

Files:

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

trunk/gdal/frmts/idrisi/IdrisiDataset.cpp

@@ -270 +270 @@
-    char **papszCategories;
-    char *pszUnitType;
-        bool bDirty;
-
-    CPLErr GeoReference2Wkt( const char *pszRefSystem,
@@ -279 +278 @@
-        char **pszRefSystem, 
-        char **pszRefUnit );
-
-        void CalculateMinMax();
-
-protected:
@@ -348 +345 @@
-    virtual const GDALRasterAttributeTable *GetDefaultRAT();
-    virtual CPLErr SetDefaultRAT( const GDALRasterAttributeTable * );
+
+    float  dfMaximum;
+    float  dfMinimum;
+    bool   bFirstVal;
-};
-
@@ -368 +369 @@
-    papszCategories = NULL;
-    pszUnitType = NULL;
-        bDirty = false;
-
-    adfGeoTransform[0] = 0.0;
@@ -388 +388 @@
-    if( papszRDC != NULL )
-    {
-               
+        
-        {       
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-            CSLSave( papszRDC, pszDocFilename );
+
-#ifndef WIN32        
-            FormatCRLF( pszDocFilename );
@@ -415 +420 @@
-    if( fp != NULL )
-        VSIFCloseL( fp );
-}
-
-/************************************************************************/
-/*                           CalculateMinMax()                          */
-/************************************************************************/
-
-void IdrisiDataset::CalculateMinMax()
-{
-        int iBand;
-        double dfMin  = 0.0;
-        double dfMax  = 0.0;
-
-    for( iBand = 0; iBand < nBands; iBand++ )
-        {
-        IdrisiRasterBand *poBand = (IdrisiRasterBand*) GetRasterBand( iBand + 1 );
-                poBand->ComputeStatistics( true, &dfMin, &dfMax, NULL, NULL, NULL, NULL );
-                poBand->SetStatistics( dfMin, dfMax, 0.0, 0.0 );
-        }       
-}
-
@@ -1027 +1014 @@
-    poDS->GetRasterBand( 1 )->GetBlockSize( &nBlockXSize, &nBlockYSize );
-
+    void *pData = VSIMalloc3( 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++ )
-    {
@@ -1033 +1031 @@
-
-        int    iYOffset, iXOffset;
-        void *pData;
-        CPLErr eErr = CE_None;
-
-        pData = CPLMalloc( nBlockXSize * nBlockYSize * GDALGetDataTypeSize( eType ) / 8 );
-
-        for( iYOffset = 0; iYOffset < nYSize; iYOffset += nBlockYSize )
@@ -1068 +1063 @@
-            }
-        }
-
-
+
+
+
-
-    // --------------------------------------------------------------------
@@ -1076 +1072 @@
-
-    poDS->FlushCache();
-
-        poDS->bDirty = ( ! ( bSuccessMin && bSuccessMax ) );
-
-    return poDS;
@@ -1228 +1222 @@
-    this->eDataType = eDataType;
-    this->poDefaultRAT = NULL;
+    this->dfMinimum = 0.0;
+    this->dfMaximum = 0.0;
+    this->bFirstVal = true;
-
-    // -------------------------------------------------------------------- 
@@ -1240 +1237 @@
-    // -------------------------------------------------------------------- 
-
-
-
-
-
+
+
+
+
+
-    {
-        CPLError(CE_Failure, CPLE_OutOfMemory,
@@ -1249 +1247 @@
-                  poDS->GetRasterXSize());
-    }
+
+    nRecordSize *= poDS->nBands;
-}
-
@@ -1317 +1317 @@
-
-CPLErr IdrisiRasterBand::IWriteBlock( int nBlockXOff, 
-
-
+ 
+ 
-{
-    IdrisiDataset *poGDS = (IdrisiDataset *) poDS;
-
-        poGDS->bDirty = true;
-
-#ifdef CPL_MSB    
@@ -1364 +1362 @@
-    }
-
+    // -------------------------------------------------------------------- 
+    //      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;
-}
@@ -1381 +1439 @@
-    if( pbSuccess )
-        {
-( ! poGDS->bDirty )
+true
-        }
-
@@ -1401 +1459 @@
-    if( pbSuccess )
-        {
-( ! poGDS->bDirty )
+true
-        }
-