block resolutions < 0

jcupitt · jcupitt · commit 9713a71bf0bf · 2022-03-22T15:09:13.000Z
since they can trigger a sanity failure in the test suite
diff --git a/libvips/foreign/exif.c b/libvips/foreign/exif.c
@@ -464,8 +464,10 @@ vips_image_resolution_from_exif( VipsImage *image, ExifData *ed )
 		"seen exif resolution %g, %g p/mm\n", xres, yres );
 #endif /*DEBUG*/
 
-	image->Xres = xres;
-	image->Yres = yres;
+	/* Don't allow negative resolution.
+	 */
+	image->Xres = VIPS_MAX( 0, xres );
+	image->Yres = VIPS_MAX( 0, yres );
 
 	return( 0 );
 }
diff --git a/libvips/iofuncs/header.c b/libvips/iofuncs/header.c
@@ -1014,8 +1014,8 @@ vips_image_init_fields( VipsImage *image,
 
 	image->Coding = coding;
 	image->Type = interpretation;
-	image->Xres = xres;
-	image->Yres = yres;
+	image->Xres = VIPS_MAX( 0, xres );
+	image->Yres = VIPS_MAX( 0, yres );
 }
 
 static void *

Original file line number	Diff line number	Diff line change
`@@ -1014,8 +1014,8 @@ vips_image_init_fields( VipsImage *image,`
`1014`	`1014`
`1015`	`1015`	`image->Coding = coding;`
`1016`	`1016`	`image->Type = interpretation;`
`1017`		`- image->Xres = xres;`
`1018`		`- image->Yres = yres;`
	`1017`	`+ image->Xres = VIPS_MAX( 0, xres );`
	`1018`	`+ image->Yres = VIPS_MAX( 0, yres );`
`1019`	`1019`	`}`
`1020`	`1020`
`1021`	`1021`	`static void *`