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

Merge branch 'master' into glib-logging

Browse Source
This commit is contained in:
John Cupitt 2017-01-04 10:13:06 +00:00
commit 262d5a10f7
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libvips/foreign/jpeg2vips.c
View File

@ -79,6 +79,8 @@
* 07/09/16 * 07/09/16
* - Don't use the exif resolution if x_resolution / y_resolution / * - Don't use the exif resolution if x_resolution / y_resolution /
* resolution_unit is missing * resolution_unit is missing
* 4/1/17
* - Don't warn for missing exif res, since we fall back to jfif now
*/ */
/* /*
@ -573,10 +575,12 @@ res_from_exif( VipsImage *im, ExifData *ed )
*/ */
if( get_entry_double( ed, 0, EXIF_TAG_X_RESOLUTION, &xres ) || if( get_entry_double( ed, 0, EXIF_TAG_X_RESOLUTION, &xres ) ||
get_entry_double( ed, 0, EXIF_TAG_Y_RESOLUTION, &yres ) || get_entry_double( ed, 0, EXIF_TAG_Y_RESOLUTION, &yres ) ||
get_entry_int( ed, 0, EXIF_TAG_RESOLUTION_UNIT, &unit ) ) { get_entry_int( ed, 0, EXIF_TAG_RESOLUTION_UNIT, &unit ) )
g_warning( "%s", _( "error reading resolution" ) ); /* Don't warn. There should be resolution info in the exif
* (according to the spec), but many images skip this and rely
* on silent fallback to the jfif resolution.
*/
return( -1 ); return( -1 );
}
#ifdef DEBUG #ifdef DEBUG
printf( "res_from_exif: seen exif tags " printf( "res_from_exif: seen exif tags "

2
libvips/foreign/vips2jpeg.c
View File

@ -455,7 +455,7 @@ write_tag( ExifData *ed, int ifd, ExifTag tag, write_fn fn, void *data )
/* This is different, we set the xres/yres from the vips header rather than /* This is different, we set the xres/yres from the vips header rather than
* from the exif tags on the image metadata. * from the exif tags on the image metadata.
* *
* This is also called from the jpg reader to fix up bad exif resoltion. * This is also called from the jpg reader to fix up bad exif resolution.
*/ */
int int
vips__set_exif_resolution( ExifData *ed, VipsImage *im ) vips__set_exif_resolution( ExifData *ed, VipsImage *im )

3
libvips/include/vips/util.h
View File

@ -135,6 +135,7 @@ G_STMT_START { \
} \ } \
} G_STMT_END } G_STMT_END
<<<<<<< HEAD
/* The g_info() macro was added in 2.40. /* The g_info() macro was added in 2.40.
*/ */
#ifndef g_info #ifndef g_info
@ -144,6 +145,8 @@ G_STMT_START { \
g_log( G_LOG_DOMAIN, G_LOG_LEVEL_INFO, __VA_ARGS__ ) g_log( G_LOG_DOMAIN, G_LOG_LEVEL_INFO, __VA_ARGS__ )
#endif #endif
=======
>>>>>>> master
/* Various integer range clips. Record over/under flows. /* Various integer range clips. Record over/under flows.
*/ */
#define VIPS_CLIP_UCHAR( V, SEQ ) \ #define VIPS_CLIP_UCHAR( V, SEQ ) \