Merge branch 'master' into glib-logging

libvips/foreign/jpeg2vips.c

@@ -79,6 +79,8 @@
  * 07/09/16
  *      - Don't use the exif resolution if x_resolution / y_resolution /
  *        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 ) ||
 		get_entry_double( ed, 0, EXIF_TAG_Y_RESOLUTION, &yres ) ||
-		get_entry_int( ed, 0, EXIF_TAG_RESOLUTION_UNIT, &unit ) ) {
-		g_warning( "%s", _( "error reading resolution" ) );
+		get_entry_int( ed, 0, EXIF_TAG_RESOLUTION_UNIT, &unit ) ) 
+		/* 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 );
-	}
 
 #ifdef DEBUG
 	printf( "res_from_exif: seen exif tags "

libvips/foreign/vips2jpeg.c

@@ -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
  * 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
 vips__set_exif_resolution( ExifData *ed, VipsImage *im )

libvips/include/vips/util.h

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