Merge branch '7.40'

Conflicts:
	ChangeLog
	configure.ac

ChangeLog

@@ -5,6 +5,9 @@
 - return of vips_init(), but just for bindings
 - revised type.c to make it more binding-friendly
 
+8/9/14 started 7.40.9
+- support jfif resunit "none"
+
 8/9/14 started 7.40.8
 - fix configure on rhel6 [Lovell]
 - mono <-> rgb converters were not handling extra bands, thanks James

libvips/foreign/jpeg2vips.c

@@ -744,6 +744,13 @@ read_jpeg_header( ReadJpeg *jpeg, VipsImage *out )
 #endif /*DEBUG*/
 
 		switch( cinfo->density_unit ) {
+		case 0:
+			/* None. Just set.
+			 */
+			xres = cinfo->X_density;
+			yres = cinfo->Y_density;
+			break;
+
 		case 1:
 			/* Pixels per inch.
 			 */