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

improvements to dzsave

Browse Source 
it wasn't making the RH column of tiles if they were cropped

makes tiles all the way down to 1x1 pixels
This commit is contained in:
John Cupitt 2012-07-05 18:08:55 +01:00
parent 4cfae3c4d0
commit fb23c3df7f
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libvips/foreign/dzsave.c
View File

@ -2,11 +2,10 @@
* *
* 21/3/12 * 21/3/12
* - from the tiff pyramid writer * - from the tiff pyramid writer
*
* 5/7/12
- need to copy overlap down strips * - make tiles down to 1x1 pixels
* - oop make right-hand edge tiles
*/ */
/* /*
@ -165,8 +164,8 @@ pyramid_build( VipsForeignSaveDz *dz, Layer *above, int w, int h )
return( NULL ); return( NULL );
} }
if( w > dz->tile_width || if( w > 1 &&
h > dz->tile_height ) { h > 1 ) {
if( !(layer->below = pyramid_build( dz, if( !(layer->below = pyramid_build( dz,
layer, w / 2, h / 2 )) ) { layer, w / 2, h / 2 )) ) {
layer_free( layer ); layer_free( layer );
@ -344,7 +343,6 @@ strip_save( Layer *layer )
{ {
VipsForeignSaveDz *dz = layer->dz; VipsForeignSaveDz *dz = layer->dz;
VipsRegion *strip = layer->strip; VipsRegion *strip = layer->strip;
int y = strip->valid.top / dz->tile_height;
VipsImage *image; VipsImage *image;
int x; int x;
@ -355,13 +353,13 @@ strip_save( Layer *layer )
strip->im->Bands, strip->im->BandFmt )) ) strip->im->Bands, strip->im->BandFmt )) )
return( -1 ); return( -1 );
for( x = 0; x < strip->valid.width / dz->tile_width; x++ ) { for( x = 0; x < strip->valid.width; x += dz->tile_width ) {
VipsImage *extr; VipsImage *extr;
VipsRect tile; VipsRect tile;
char str[1000]; char str[1000];
VipsBuf buf = VIPS_BUF_STATIC( str ); VipsBuf buf = VIPS_BUF_STATIC( str );
tile.left = x * dz->tile_width; tile.left = x;
tile.top = strip->valid.top; tile.top = strip->valid.top;
tile.width = dz->tile_width + dz->overlap; tile.width = dz->tile_width + dz->overlap;
tile.height = dz->tile_height + dz->overlap; tile.height = dz->tile_height + dz->overlap;
@ -377,7 +375,8 @@ strip_save( Layer *layer )
vips_buf_appendf( &buf, "%s/%d/%d_%d%s", vips_buf_appendf( &buf, "%s/%d/%d_%d%s",
dz->dirname, layer->n, dz->dirname, layer->n,
x, y, x / dz->tile_width,
strip->valid.top / dz->tile_height,
dz->suffix ); dz->suffix );
if( vips_image_write_to_file( extr, vips_buf_all( &buf ) ) ) { if( vips_image_write_to_file( extr, vips_buf_all( &buf ) ) ) {

BIN
po/en_GB.gmo
View File

Binary file not shown.