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

Merge branch '8.12'

Browse Source
This commit is contained in:
John Cupitt 2021-11-26 11:12:47 +00:00
commit ba5afffd68
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -2,6 +2,9 @@
- configure fails for requested but unmet dependencies [remicollet] - configure fails for requested but unmet dependencies [remicollet]
- add support for another quantiser [DarthSim] - add support for another quantiser [DarthSim]
26/11/21 started 8.12.2
- make exif resuint optional and default to inch
21/11/21 started 8.12.1 21/11/21 started 8.12.1
- fix insert [chregu] - fix insert [chregu]

10
libvips/foreign/exif.c
View File

@ -416,11 +416,15 @@ vips_image_resolution_from_exif( VipsImage *image, ExifData *ed )
*/ */
if( vips_exif_entry_get_double( ed, 0, EXIF_TAG_X_RESOLUTION, &xres ) || if( vips_exif_entry_get_double( ed, 0, EXIF_TAG_X_RESOLUTION, &xres ) ||
vips_exif_entry_get_double( ed, vips_exif_entry_get_double( ed,
0, EXIF_TAG_Y_RESOLUTION, &yres ) || 0, EXIF_TAG_Y_RESOLUTION, &yres ) )
vips_exif_entry_get_int( ed,
0, EXIF_TAG_RESOLUTION_UNIT, &unit ) )
return( -1 ); return( -1 );
/* resuint is optional and defaults to inch.
*/
unit = 2;
(void) vips_exif_entry_get_int( ed,
0, EXIF_TAG_RESOLUTION_UNIT, &unit );
#ifdef DEBUG #ifdef DEBUG
printf( "vips_image_resolution_from_exif: seen exif tags " printf( "vips_image_resolution_from_exif: seen exif tags "
"xres = %g, yres = %g, unit = %d\n", xres, yres, unit ); "xres = %g, yres = %g, unit = %d\n", xres, yres, unit );