Changeset 14477 for branches

Timestamp:

05/16/08 16:17:25 (3 months ago)

Author:

rouault

Message:

Fix wrong data type used to read the source band AAIGCreateCopy (#2369)

Files:

• branches/1.5/gdal/frmts/aaigrid/aaigriddataset.cpp (modified) (2 diffs)

branches/1.5/gdal/frmts/aaigrid/aaigriddataset.cpp

@@ -767 +767 @@
-/*      Loop over image, copying image data.                            */
-/* -------------------------------------------------------------------- */
-
+
+
+
-    int         iLine, iPixel;
-    CPLErr      eErr = CE_None;
-    
+    bReadAsInt = ( poBand->GetRasterDataType() == GDT_Byte 
+                || poBand->GetRasterDataType() == GDT_Int16
+                || poBand->GetRasterDataType() == GDT_UInt16
+                || poBand->GetRasterDataType() == GDT_Int32 );
+
-    // Write scanlines to output file
-
-
+
+
+
+
+
+
+
-    for( iLine = 0; eErr == CE_None && iLine < nYSize; iLine++ )
-    {
-        eErr = poBand->RasterIO( GF_Read, 0, iLine, nXSize, 1, 
-
-
-
-
-
-
-
+
+
+
+
+
-        {
-            for ( iPixel = 0; iPixel < nXSize; iPixel++ )
-            {
-(int) padf
+pan
-                if( VSIFWriteL( szHeader, strlen(szHeader), 1, fpImage ) != 1 )
-                {
@@ -822 +832 @@
-    }
-
+    CPLFree( panScanline );
-    CPLFree( padfScanline );
-    VSIFCloseL( fpImage );