sergiotarxz/libvips
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix tiled read

Browse Source
This commit is contained in:
John Cupitt 2021-03-18 09:52:38 +00:00
parent c0ec1757cb
commit 52e32dec19
1 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
libvips/foreign/jp2kload.c
View File

@ -35,9 +35,9 @@
*/ */
/* /*
#define DEBUG
#define VIPS_DEBUG
*/ */
#define DEBUG
#define DEBUG_VERBOSE
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include <config.h> #include <config.h>
@ -549,7 +549,7 @@ vips_foreign_load_jp2k_repack( VipsForeignLoadJp2k *jp2k,
for( i = 0; i < b; i++ ) for( i = 0; i < b; i++ )
planes[i] = jp2k->image->comps[i].data + planes[i] = jp2k->image->comps[i].data +
top * jp2k->image->x1 + left; top * jp2k->image->comps[i].w + left;
switch( image->BandFmt ) { switch( image->BandFmt ) {
case VIPS_FORMAT_UCHAR: case VIPS_FORMAT_UCHAR:
@ -579,9 +579,11 @@ vips_foreign_load_jp2k_generate( VipsRegion *out,
int x, y, z; int x, y, z;
#ifdef DEBUG #ifdef DEBUG_VERBOSE
printf( "vips_foreign_load_jp2k_generate:\n" ); printf( "vips_foreign_load_jp2k_generate: "
#endif /*DEBUG*/ "left = %d, top = %d, width = %d, height = %d\n",
r->left, r->top, r->width, r->height );
#endif /*DEBUG_VERBOSE*/
y = 0; y = 0;
while( y < r->height ) { while( y < r->height ) {
@ -594,15 +596,23 @@ vips_foreign_load_jp2k_generate( VipsRegion *out,
x = 0; x = 0;
while( x < r->width ) { while( x < r->width ) {
/* Coordinate of the tile on this page that xy falls in. /* Tile the xy falls in, in tile numbers.
*/ */
int xs = ((r->left + x) / tile_width) * tile_width; int tx = (r->left + x) / tile_width;
int ys = ((r->top + y) / tile_height) * tile_height; int ty = (r->top + y) / tile_height;
int tile_index = ys * jp2k->info->tw + xs; /* Pixel coordinates of the tile that xy falls in.
*/
int xs = tx * tile_width;
int ys = ty * tile_height;
int tile_index = ty * jp2k->info->tw + tx;
/* Fetch the tile. /* Fetch the tile.
*/ */
#ifdef DEBUG_VERBOSE
printf( " fetch file %d\n", tile_index );
#endif /*DEBUG_VERBOSE*/
if( !opj_get_decoded_tile( jp2k->codec, if( !opj_get_decoded_tile( jp2k->codec,
jp2k->stream, jp2k->image, tile_index ) ) jp2k->stream, jp2k->image, tile_index ) )
return( -1 ); return( -1 );