Changeset 12221

Timestamp:

09/20/07 16:12:16 (1 year ago)

Author:

warmerdam

Message:

use toff_t for tiff offsets - critical bigtiff fixes

Files:

• trunk/gdal/frmts/gtiff/geotiff.cpp (modified) (4 diffs)
• trunk/gdal/frmts/gtiff/tif_overview.c (modified) (3 diffs)
• trunk/gdal/frmts/gtiff/tif_ovrcache.h (modified) (2 diffs)

trunk/gdal/frmts/gtiff/geotiff.cpp

@@ -2109 +2109 @@
-        if( panOverviewList[i] > 0 )
-        {
-uint32
+toff_t
-            int         nOXSize, nOYSize;
-
@@ -2183 +2183 @@
-                {
-                    papoOverviewBands[nNewOverviews++] = poOverview;
+                    break;
-                }
-            }
@@ -2775 +2776 @@
-    const char *pszFilename = pszCompositeName + 10;
-    int        bAbsolute = FALSE;
-uint32
+toff_t
-    
-    if( EQUALN(pszFilename,"off:",4) )
@@ -3422 +3423 @@
-               && TIFFReadDirectory( hTIFF ) != 0 )
-        {
-uint32
+toff_t
-            uint32      nSubType;
-

trunk/gdal/frmts/gtiff/tif_overview.c

@@ -80 +80 @@
-/************************************************************************/
-
-uint32
+toff_t
-                           int nBitsPerPixel, int nPlanarConfig, int nSamples, 
-                           int nBlockXSize, int nBlockYSize,
@@ -91 +91 @@
-
-{
-uint32
-uint32
+toff_t
+toff_t
-
-    nBaseDirOffset = TIFFCurrentDirOffset( hTIFF );
@@ -564 +564 @@
-    {
-        int     nOXSize, nOYSize, nOBlockXSize, nOBlockYSize;
-uint32
+toff_t
-
-        nOXSize = (nXSize + panOvList[i] - 1) / panOvList[i];

trunk/gdal/frmts/gtiff/tif_ovrcache.h

@@ -60 +60 @@
-    unsigned char *pabyRow2Blocks;
-
-int        
+toff_t
-    TIFF        *hTIFF;
-    int         bTiled;
@@ -82 +82 @@
-                               int nSampleFormat, const char * pszResampling );
-
-uint32
+toff_t
-                           int, int, int, int, unsigned short *,
-                           unsigned short *, unsigned short *, int );