Changeset 14739

Timestamp:

06/21/08 00:31:47 (5 months ago)

Author:

warmerdam

Message:

push extra bands of pixel interleaved data into block cache (#2435)

Files:

• branches/1.5/gdal/frmts/gtiff/geotiff.cpp (modified) (1 diff)

branches/1.5/gdal/frmts/gtiff/geotiff.cpp

@@ -557 +557 @@
-            }
-            pabyImage += poGDS->nBands * nWordBytes;
+        }
+    }
+
+/* -------------------------------------------------------------------- */
+/*      In the fairly common case of pixel interleaved 8bit data        */
+/*      that is multi-band, lets push the rest of the data into the     */
+/*      block cache too, to avoid (hopefully) having to redecode it.    */
+/*                                                                      */
+/*      Our following logic actually depends on the fact that the       */
+/*      this block is already loaded, so subsequent calls will end      */
+/*      up back in this method and pull from the loaded block.          */
+/* -------------------------------------------------------------------- */
+    if( poGDS->nBitsPerSample == 8 && poGDS->nBands != 1 
+        && eErr == CE_None )
+    {
+        int iOtherBand;
+
+        for( iOtherBand = 1; iOtherBand <= poGDS->nBands; iOtherBand++ )
+        {
+            if( iOtherBand == nBand )
+                continue;
+
+            GDALRasterBlock *poBlock;
+
+            poBlock = poGDS->GetRasterBand(iOtherBand)->
+                GetLockedBlockRef(nBlockXOff,nBlockYOff);
+            poBlock->DropLock();
-        }
-    }