Changeset 11514

Timestamp:

05/14/07 13:39:27 (2 years ago)

Author:

warmerdam

Message:

fix handling of multi-tile ycbcr decocded data (#1636)

Files:

• branches/1.4/gdal/frmts/jp2kak/jp2kakdataset.cpp (modified) (5 diffs)

branches/1.4/gdal/frmts/jp2kak/jp2kakdataset.cpp

@@ -185 +185 @@
-    void        ApplyPalette( jp2_palette oJP2Palette );
-    void        ProcessYCbCrTile(kdu_tile tile, GByte *pabyBuffer, 
-
+
+
-    void        ProcessTile(kdu_tile tile, GByte *pabyBuffer );
-};
@@ -557 +558 @@
-                kdu_coords offset = tile_dims.pos - dims.pos;
-
-                GByte *pabyDest;
-
-                pabyDest = ((GByte *)pImage) 
-                    + (offset.x + offset.y*nBlockXSize) * nWordSize;
-
-                try 
-                {
-                    if( tile.get_ycc() && nBand < 4 )
-
-
+
+
+
-                    else
+                    {
+                        GByte *pabyDest;
+                        
+                        pabyDest = ((GByte *)pImage) 
+                            + (offset.x + offset.y*nBlockXSize) * nWordSize;
+
-                        ProcessTile( tile, pabyDest );
+                    }
-                    tile.close();
-                }
@@ -650 +654 @@
-
-void JP2KAKRasterBand::ProcessYCbCrTile( kdu_tile tile, GByte *pabyDest, 
-
+
+
-
-{
@@ -715 +720 @@
-
-            apoBlocks[iBand] = 
-TileXOff, nTile
+BlockXOff, nBlock
-            apabyBandDest[iBand] = (GByte *) apoBlocks[iBand]->GetDataRef();
-        }
@@ -759 +764 @@
-
-        for( iBand = 0; iBand < 3; iBand++ )
-
+
+
-                           line[iBand], nWordSize, bit_depth, eDataType );
-    }