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

Merge remote-tracking branch 'origin/8.0' 

Conflicts:
	ChangeLog
	configure.ac
	doc/libvips-docs.xml
This commit is contained in:
John Cupitt 2015-05-24 18:19:32 +01:00
parent 8a711cef55 3451766004
commit cea1e29527
3 changed files with 39 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -5,6 +5,9 @@
- vipsthumbnail uses vips_premultiply() for better alpha quality
- vips_copy() can turn 1xN or Nx1 M-band images into MxN one-band images
7/5/15 started 8.0.3
- dzsave and tif pyr write could fail for some image dimensions, thanks Jonas
4/5/15 started 8.0.2
- fix a refcount error in C++ wrapper, thanks huskier
- better C++ api test

25
libvips/foreign/dzsave.c
View File

@ -1330,8 +1330,10 @@ static int
strip_arrived( Layer *layer )
{
VipsForeignSaveDz *dz = layer->dz;
VipsRect new_strip;
VipsRect overlap;
VipsRect image_area;
if( strip_save( layer ) )
return( -1 );
@ -1350,6 +1352,13 @@ strip_arrived( Layer *layer )
new_strip.top = layer->y - dz->overlap;
new_strip.width = layer->image->Xsize;
new_strip.height = dz->tile_size + 2 * dz->overlap;
image_area.left = 0;
image_area.top = 0;
image_area.width = layer->image->Xsize;
image_area.height = layer->image->Ysize;
vips_rect_intersectrect( &new_strip, &image_area, &new_strip );
if( (new_strip.height & 1) == 1 )
new_strip.height += 1;
@ -1375,14 +1384,16 @@ strip_arrived( Layer *layer )
&overlap, overlap.left, overlap.top );
}
if( vips_region_buffer( layer->strip, &new_strip ) )
return( -1 );
if( !vips_rect_isempty( &new_strip ) ) {
if( vips_region_buffer( layer->strip, &new_strip ) )
return( -1 );
/* And copy back again.
*/
if( !vips_rect_isempty( &overlap ) )
vips_region_copy( layer->copy, layer->strip,
&overlap, overlap.left, overlap.top );
/* And copy back again.
*/
if( !vips_rect_isempty( &overlap ) )
vips_region_copy( layer->copy, layer->strip,
&overlap, overlap.left, overlap.top );
}
return( 0 );
}

26
libvips/foreign/vips2tiff.c
View File

@ -1236,6 +1236,7 @@ layer_strip_arrived( Layer *layer )
int result;
VipsRect new_strip;
VipsRect overlap;
VipsRect image_area;
if( write->tile )
result = layer_write_tile( write, layer, layer->strip );
@ -1245,7 +1246,7 @@ layer_strip_arrived( Layer *layer )
return( -1 );
if( layer->below &&
layer_strip_shrink( layer ) )
layer_strip_shrink( layer ) )
return( -1 );
/* Position our strip down the image.
@ -1258,6 +1259,13 @@ layer_strip_arrived( Layer *layer )
new_strip.top = layer->y;
new_strip.width = layer->image->Xsize;
new_strip.height = write->tileh;
image_area.left = 0;
image_area.top = 0;
image_area.width = layer->image->Xsize;
image_area.height = layer->image->Ysize;
vips_rect_intersectrect( &new_strip, &image_area, &new_strip );
if( (new_strip.height & 1) == 1 )
new_strip.height += 1;
@ -1272,14 +1280,16 @@ layer_strip_arrived( Layer *layer )
&overlap, overlap.left, overlap.top );
}
if( vips_region_buffer( layer->strip, &new_strip ) )
return( -1 );
if( !vips_rect_isempty( &new_strip ) ) {
if( vips_region_buffer( layer->strip, &new_strip ) )
return( -1 );
/* And copy back again.
*/
if( !vips_rect_isempty( &overlap ) )
vips_region_copy( layer->copy, layer->strip,
&overlap, overlap.left, overlap.top );
/* And copy back again.
*/
if( !vips_rect_isempty( &overlap ) )
vips_region_copy( layer->copy, layer->strip,
&overlap, overlap.left, overlap.top );
}
return( 0 );
}