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

Incorporate #2506 also in {webp,magick7}load (#2507)

Browse Source
This commit is contained in:
Kleis Auke Wolthuizen 2021-11-01 19:33:27 +01:00 committed by GitHub
parent 9c1003fbe6
commit f92069b035
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libvips/foreign/magick7load.c
View File

@ -601,7 +601,7 @@ vips_foreign_load_magick7_parse( VipsForeignLoadMagick7 *magick7,
/* So we can finally set the height. /* So we can finally set the height.
*/ */
if( vips_object_argument_isset( VIPS_OBJECT( magick7 ), "n" ) ) { if( read->n_frames > 1 ) {
vips_image_set_int( out, VIPS_META_PAGE_HEIGHT, out->Ysize ); vips_image_set_int( out, VIPS_META_PAGE_HEIGHT, out->Ysize );
out->Ysize *= magick7->n_frames; out->Ysize *= magick7->n_frames;
} }

4
libvips/foreign/webp2vips.c
View File

@ -519,6 +519,10 @@ read_header( Read *read, VipsImage *out )
#endif /*DEBUG*/ #endif /*DEBUG*/
if( flags & ANIMATION_FLAG ) { if( flags & ANIMATION_FLAG ) {
/* Only set page-height if we have more than one page, or
* this could accidentally turn into an animated image later.
*/
if( read->n > 1 )
vips_image_set_int( out, vips_image_set_int( out,
VIPS_META_PAGE_HEIGHT, read->frame_height ); VIPS_META_PAGE_HEIGHT, read->frame_height );