Changeset 13927

Timestamp:

03/04/08 16:03:55 (2 months ago)

Author:

rouault

Message:

Handle >2GB memory arrays on a 64-bit build (#2199)

Files:

• branches/1.5/gdal/gcore/rasterio.cpp (modified) (6 diffs)

branches/1.5/gdal/gcore/rasterio.cpp

@@ -108 +108 @@
-            {
-                if( eRWFlag == GF_Read )
-
+(size_t)
-                            pabySrcBlock + nSrcByteOffset, 
-                            nLineSpace );
-                else
-                    memcpy( pabySrcBlock + nSrcByteOffset, 
-
+(size_t)
-                            nLineSpace );
-            }
@@ -123 +123 @@
-                    GDALCopyWords( pabySrcBlock + nSrcByteOffset,
-                                   eDataType, nBandDataSize,
-
+(size_t)
-                                   eBufType, nPixelSpace, nBufXSize );
-                else
-
+(size_t)
-                                   eBufType, nPixelSpace,
-                                   pabySrcBlock + nSrcByteOffset,
@@ -177 +177 @@
-        for( iBufYOff = 0, iSrcY = nYOff; iBufYOff < nBufYSize; iBufYOff++, iSrcY++ )
-        {
-
-
-
+
+
+
+
-            nLBlockY = iSrcY / nBlockYSize;
-            nLBlockX = nLBlockXStart;
@@ -230 +231 @@
-/*      Copy over this chunk of data.                                   */
-/* -------------------------------------------------------------------- */
-iSrcX - 
-iSrcY - 
+(size_t)iSrcX - (size_t)
+(size_t)iSrcY - (size_t)
-
-                if( eDataType == eBufType 
@@ -294 +295 @@
-    for( iBufYOff = 0; iBufYOff < nBufYSize; iBufYOff++ )
-    {
-int  
+size_t
-        
-        dfSrcY = (iBufYOff+0.5) * dfSrcYInc + nYOff;
-        iSrcY = (int) dfSrcY;
-
-
+(size_t)
-        
-        for( iBufXOff = 0; iBufXOff < nBufXSize; iBufXOff++ )
@@ -349 +350 @@
-/*      Copy over this pixel of data.                                   */
-/* -------------------------------------------------------------------- */
-iSrcX - 
-iSrcY - 
+(size_t)iSrcX - (size_t)
+(size_t)iSrcY - (size_t)
-
-            if( eDataType == eBufType )