Changeset 14478

Timestamp:

05/16/08 16:34:08 (2 months ago)

Author:

rouault

Message:

Set AAIGRID raster band data type to Int32 if there are no floating point values in the first 100K chunk and in no data, otherwise choose Float32 (#2369)

Files:

• trunk/gdal/frmts/aaigrid/aaigriddataset.cpp (modified) (6 diffs)

trunk/gdal/frmts/aaigrid/aaigriddataset.cpp

@@ -223 +223 @@
-                ((float *) pImage)[iPixel] = (float) atof(szToken);
-            else
-16 *) pImage)[iPixel] = (GInt16
+32 *) pImage)[iPixel] = (GInt32
-        }
-        
@@ -380 +380 @@
-    int j = 0;
-    char **papszTokens = NULL;
-
+
+
+
-
-/* -------------------------------------------------------------------- */
@@ -483 +485 @@
-        poDS->bNoDataSet = TRUE;
-        poDS->dfNoDataValue = atof(pszNoData);
+        if( strchr( pszNoData, '.' ) != NULL )
+        {
+            eDataType = GDT_Float32;
+        }
-    }
-    
@@ -534 +540 @@
-    /* Use bigger data type. */
-    if( poDS->bNoDataSet
-SHRT_MIN > poDS->dfNoDataValue || poDS->dfNoDataValue > SHR
+INT_MIN > poDS->dfNoDataValue || poDS->dfNoDataValue > IN
-    {
-        eDataType = GDT_Float32; 
@@ -540 +546 @@
-    else
-    {
-        /* Default value type. */
-        eDataType = GDT_Int16;
-
-        /* Allocate 100K chunk + 1 extra byte for NULL character. */
-        const size_t nChunkSize = 1024 * 100;
@@ -944 +947 @@
-        poDriver->SetMetadataItem( GDAL_DMD_EXTENSION, "asc" );
-        poDriver->SetMetadataItem( GDAL_DMD_CREATIONDATATYPES, 
-
+Int32 
-
-        poDriver->SetMetadataItem( GDAL_DCAP_VIRTUALIO, "YES" );