Changeset 13432

Timestamp:

12/21/07 13:09:50 (5 months ago)

Author:

mloskot

Message:

Re-fix nodata test when determining AAIGrid data type (Ticket #2107).

Files:

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

trunk/gdal/frmts/aaigrid/aaigriddataset.cpp

@@ -30 +30 @@
-#include "gdal_pam.h"
-#include <ctype.h>
+#include <limits.h>
-#include "cpl_string.h"
-#include "ogr_spatialref.h"
@@ -380 +381 @@
-    char **papszTokens = NULL;
-    GDALDataType eDataType = GDT_Int16;
-    GDALDataType eNoDataType = GDT_Int16;
-
-/* -------------------------------------------------------------------- */
@@ -483 +483 @@
-        poDS->bNoDataSet = TRUE;
-        poDS->dfNoDataValue = atof(pszNoData);
-        
-        if( strchr(pszNoData, '.' ) != NULL )
-            eNoDataType = GDT_Float32;
-    }
-    
@@ -535 +532 @@
-    CPLAssert( NULL != poDS->fp );
-
-
-
+
+
+
-    {
-        eDataType = GDT_Float32;