Add double export test/

refresh goldens for vips 8.13.1
davidbyttow · Oct 8, 2022 · aaee584 · aaee584
1 parent 5f0601e
commit aaee584
Show file tree

Hide file tree

Showing 107 changed files with 25 additions and 7 deletions.
diff --git a/resources/bmp.Decode_BMP-macos-11.golden.png b/resources/bmp.Decode_BMP-macos-11.golden.png
diff --git a/resources/gif-animated.GIF_Animated-macos-12.golden.gif b/resources/gif-animated.GIF_Animated-macos-12.golden.gif
diff --git a/resources/gif-animated.GIF_Animated_Embed-macos-12.golden.gif b/resources/gif-animated.GIF_Animated_Embed-macos-12.golden.gif
diff --git a/resources/gif-animated.GIF_Animated_EmbedBackground-macos-12.golden.gif b/resources/gif-animated.GIF_Animated_EmbedBackground-macos-12.golden.gif
diff --git a/resources/gif-animated.GIF_Animated_ExportNative-macos-12.golden.gif b/resources/gif-animated.GIF_Animated_ExportNative-macos-12.golden.gif
diff --git a/resources/gif-animated.GIF_Animated_ExtractArea-macos-12.golden.gif b/resources/gif-animated.GIF_Animated_ExtractArea-macos-12.golden.gif
diff --git a/resources/gif-animated.GIF_Animated_PageDelay-macos-12.golden.gif b/resources/gif-animated.GIF_Animated_PageDelay-macos-12.golden.gif
diff --git a/resources/gif-animated.GIF_Animated_PageDelay2-macos-12.golden.gif b/resources/gif-animated.GIF_Animated_PageDelay2-macos-12.golden.gif
diff --git a/resources/gif-animated.GIF_Animated_Resize-macos-12.golden.gif b/resources/gif-animated.GIF_Animated_Resize-macos-12.golden.gif
diff --git a/resources/gif-animated.GIF_Animated_Rotate270-macos-12.golden.gif b/resources/gif-animated.GIF_Animated_Rotate270-macos-12.golden.gif
diff --git a/resources/gif-animated.GIF_Animated_Rotate90-macos-12.golden.gif b/resources/gif-animated.GIF_Animated_Rotate90-macos-12.golden.gif
diff --git a/resources/gif-animated.TestThumbnail_GIF-macos-12.golden.gif b/resources/gif-animated.TestThumbnail_GIF-macos-12.golden.gif
diff --git a/resources/gif-animated.TestThumbnail_GIF_Animated-macos-12.golden.gif b/resources/gif-animated.TestThumbnail_GIF_Animated-macos-12.golden.gif
diff --git a/resources/gif-animated.TestThumbnail_GIF_Animated_Force-macos-12.golden.gif b/resources/gif-animated.TestThumbnail_GIF_Animated_Force-macos-12.golden.gif
diff --git a/resources/gif-animated.TestThumbnail_GIF_ExportNative-macos-12.golden.gif b/resources/gif-animated.TestThumbnail_GIF_ExportNative-macos-12.golden.gif
diff --git a/resources/gif-animated.TestThumbnail_GIF_ExportWebP-macos-12.golden.webp b/resources/gif-animated.TestThumbnail_GIF_ExportWebP-macos-12.golden.webp
diff --git a/...s/has-icc-profile.TestImageRef_PngToWebp_OptimizeICCProfile_Lossless-macos-11.golden.webp b/...s/has-icc-profile.TestImageRef_PngToWebp_OptimizeICCProfile_Lossless-macos-11.golden.webp
diff --git a/...s/has-icc-profile.TestImageRef_PngToWebp_OptimizeICCProfile_Lossless-macos-12.golden.webp b/...s/has-icc-profile.TestImageRef_PngToWebp_OptimizeICCProfile_Lossless-macos-12.golden.webp
diff --git a/resources/heic-24bit-exif.RemoveMetadata_Removes_Exif-macos-11.golden.heic b/resources/heic-24bit-exif.RemoveMetadata_Removes_Exif-macos-11.golden.heic
diff --git a/resources/heic-24bit-exif.RemoveMetadata_Removes_Exif-macos-12.golden.heic b/resources/heic-24bit-exif.RemoveMetadata_Removes_Exif-macos-12.golden.heic
diff --git a/resources/heic-orientation-6.AutoRotate_6__heic_to_jpg-macos-11.golden.jpeg b/resources/heic-orientation-6.AutoRotate_6__heic_to_jpg-macos-11.golden.jpeg
diff --git a/...es/jpg-24bit-icc-adobe-rgb.OptimizeICCProfile_RGB_Embedded-macos-11.golden.jpeg b/...es/jpg-24bit-icc-adobe-rgb.OptimizeICCProfile_RGB_Embedded-macos-11.golden.jpeg
diff --git a/resources/jpg-24bit-icc-iec.AutoRotate_1-macos-11.golden.jpeg b/resources/jpg-24bit-icc-iec.AutoRotate_1-macos-11.golden.jpeg
diff --git a/resources/jpg-24bit-icc-iec.ExtractArea-macos-11.golden.jpeg b/resources/jpg-24bit-icc-iec.ExtractArea-macos-11.golden.jpeg
diff --git a/resources/jpg-24bit-icc-iec.Modulate-macos-11.golden.jpeg b/resources/jpg-24bit-icc-iec.Modulate-macos-11.golden.jpeg
diff --git a/resources/jpg-24bit-icc-iec.ModulateHSV-macos-11.golden.jpeg b/resources/jpg-24bit-icc-iec.ModulateHSV-macos-11.golden.jpeg
diff --git a/resources/jpg-24bit-icc-iec.ModulateHSV-macos-12.golden.jpeg b/resources/jpg-24bit-icc-iec.ModulateHSV-macos-12.golden.jpeg
diff --git a/resources/jpg-24bit-icc-iec.OptimizeCoding-macos-11.golden.jpeg b/resources/jpg-24bit-icc-iec.OptimizeCoding-macos-11.golden.jpeg
diff --git a/resources/jpg-24bit-icc-iec.OptimizeScans-macos-11.golden.jpeg b/resources/jpg-24bit-icc-iec.OptimizeScans-macos-11.golden.jpeg
diff --git a/resources/jpg-24bit-icc-iec.OvershootDeringing-macos-11.golden.jpeg b/resources/jpg-24bit-icc-iec.OvershootDeringing-macos-11.golden.jpeg
diff --git a/resources/jpg-24bit-icc-iec.Pixelate-macos-12.golden.jpeg b/resources/jpg-24bit-icc-iec.Pixelate-macos-12.golden.jpeg
diff --git a/resources/jpg-24bit-icc-iec.QuantTable-macos-11.golden.jpeg b/resources/jpg-24bit-icc-iec.QuantTable-macos-11.golden.jpeg
diff --git a/resources/jpg-24bit-icc-iec.Rotate-macos-11.golden.jpeg b/resources/jpg-24bit-icc-iec.Rotate-macos-11.golden.jpeg
diff --git a/resources/jpg-24bit-icc-iec.SubsampleMode-macos-11.golden.jpeg b/resources/jpg-24bit-icc-iec.SubsampleMode-macos-11.golden.jpeg
diff --git a/resources/jpg-24bit-icc-iec.TrellisQuant-macos-11.golden.jpeg b/resources/jpg-24bit-icc-iec.TrellisQuant-macos-11.golden.jpeg
diff --git a/resources/jpg-24bit-icc-smpte.RemoveICCProfile-macos-11.golden.jpeg b/resources/jpg-24bit-icc-smpte.RemoveICCProfile-macos-11.golden.jpeg
diff --git a/resources/jpg-24bit.Add-macos-11.golden.jpeg b/resources/jpg-24bit.Add-macos-11.golden.jpeg
diff --git a/resources/jpg-24bit.BandJoinConst-macos-11.golden.jpeg b/resources/jpg-24bit.BandJoinConst-macos-11.golden.jpeg
diff --git a/resources/jpg-24bit.Black-macos-11.golden.jpeg b/resources/jpg-24bit.Black-macos-11.golden.jpeg
diff --git a/resources/jpg-24bit.Decode_JPG-macos-11.golden.jpeg b/resources/jpg-24bit.Decode_JPG-macos-11.golden.jpeg
diff --git a/resources/jpg-24bit.DrawRect-macos-11.golden.jpeg b/resources/jpg-24bit.DrawRect-macos-11.golden.jpeg
diff --git a/resources/jpg-24bit.DrawRectRGBA-macos-11.golden.jpeg b/resources/jpg-24bit.DrawRectRGBA-macos-11.golden.jpeg
diff --git a/resources/jpg-24bit.Embed-macos-11.golden.jpeg b/resources/jpg-24bit.Embed-macos-11.golden.jpeg
diff --git a/resources/jpg-24bit.EmbedBackground_NoAlpha-macos-11.golden.jpeg b/resources/jpg-24bit.EmbedBackground_NoAlpha-macos-11.golden.jpeg
diff --git a/resources/jpg-24bit.Flip-macos-11.golden.jpeg b/resources/jpg-24bit.Flip-macos-11.golden.jpeg
diff --git a/resources/jpg-24bit.GaussianBlur-macos-11.golden.jpeg b/resources/jpg-24bit.GaussianBlur-macos-11.golden.jpeg
diff --git a/resources/jpg-24bit.GaussianBlur-macos-12.golden.jpeg b/resources/jpg-24bit.GaussianBlur-macos-12.golden.jpeg
diff --git a/resources/jpg-24bit.Invert-macos-11.golden.jpeg b/resources/jpg-24bit.Invert-macos-11.golden.jpeg
diff --git a/resources/jpg-24bit.Multiply-macos-11.golden.jpeg b/resources/jpg-24bit.Multiply-macos-11.golden.jpeg
diff --git a/resources/jpg-24bit.OptimizeICCProfile_RGB_No_Profile-macos-11.golden.jpeg b/resources/jpg-24bit.OptimizeICCProfile_RGB_No_Profile-macos-11.golden.jpeg
diff --git a/resources/jpg-24bit.ResizeWithVScale-macos-11.golden.jpeg b/resources/jpg-24bit.ResizeWithVScale-macos-11.golden.jpeg
diff --git a/resources/jpg-24bit.Resize_Downscale-macos-11.golden.jpeg b/resources/jpg-24bit.Resize_Downscale-macos-11.golden.jpeg
diff --git a/resources/jpg-24bit.Resize_Upscale-macos-11.golden.jpeg b/resources/jpg-24bit.Resize_Upscale-macos-11.golden.jpeg
diff --git a/resources/jpg-24bit.SimilarityRGB-macos-11.golden.jpeg b/resources/jpg-24bit.SimilarityRGB-macos-11.golden.jpeg
diff --git a/resources/jpg-24bit.SimilarityRGBA-macos-11.golden.jpeg b/resources/jpg-24bit.SimilarityRGBA-macos-11.golden.jpeg
diff --git a/resources/jpg-24bit.SmartCrop-macos-11.golden.jpeg b/resources/jpg-24bit.SmartCrop-macos-11.golden.jpeg
diff --git a/resources/jpg-24bit.TestImageRef_Divide-macos-11.golden.jpeg b/resources/jpg-24bit.TestImageRef_Divide-macos-11.golden.jpeg
diff --git a/resources/jpg-24bit.Zoom-macos-11.golden.jpeg b/resources/jpg-24bit.Zoom-macos-11.golden.jpeg
diff --git a/resources/jpg-32bit-cmyk-icc-swop.OptimizeICCProfile_CMYK-macos-11.golden.jpeg b/resources/jpg-32bit-cmyk-icc-swop.OptimizeICCProfile_CMYK-macos-11.golden.jpeg
diff --git a/...g-8bit-gray-scale-with-icc-profile.OptimizeICCProfile_Grey-macos-11.golden.jpeg b/...g-8bit-gray-scale-with-icc-profile.OptimizeICCProfile_Grey-macos-11.golden.jpeg
diff --git a/...rey-icc-dot-gain.TestImageRef_RemoveMetadata_Leave_Profile-macos-11.golden.jpeg b/...rey-icc-dot-gain.TestImageRef_RemoveMetadata_Leave_Profile-macos-11.golden.jpeg
diff --git a/resources/jpg-8bit-grey-icc-dot-gain.Thumbnail_CropCentered-macos-11.golden.jpeg b/resources/jpg-8bit-grey-icc-dot-gain.Thumbnail_CropCentered-macos-11.golden.jpeg
diff --git a/resources/jpg-8bit-grey-icc-dot-gain.Thumbnail_CropCentered-macos-12.golden.jpeg b/resources/jpg-8bit-grey-icc-dot-gain.Thumbnail_CropCentered-macos-12.golden.jpeg
diff --git a/resources/jpg-8bit-grey-icc-dot-gain.Thumbnail_NoCrop-macos-11.golden.jpeg b/resources/jpg-8bit-grey-icc-dot-gain.Thumbnail_NoCrop-macos-11.golden.jpeg
diff --git a/resources/jpg-8bit-grey-icc-dot-gain.Thumbnail_NoCrop-macos-12.golden.jpeg b/resources/jpg-8bit-grey-icc-dot-gain.Thumbnail_NoCrop-macos-12.golden.jpeg
diff --git a/resources/jpg-orientation-5.AutoRotate_5-macos-11.golden.jpeg b/resources/jpg-orientation-5.AutoRotate_5-macos-11.golden.jpeg
diff --git a/...rientation-5.TestImageRef_RemoveMetadata_Leave_Orientation-macos-11.golden.jpeg b/...rientation-5.TestImageRef_RemoveMetadata_Leave_Orientation-macos-11.golden.jpeg
diff --git a/resources/jpg-orientation-6.AutoRotate_6-macos-11.golden.jpeg b/resources/jpg-orientation-6.AutoRotate_6-macos-11.golden.jpeg
diff --git a/resources/jpg-orientation-6.AutoRotate_6__jpeg_to_webp-macos-11.golden.webp b/resources/jpg-orientation-6.AutoRotate_6__jpeg_to_webp-macos-11.golden.webp
diff --git a/resources/orientation-issue-1.TestImageRef_Orientation_Issue-macos-11.golden.webp b/resources/orientation-issue-1.TestImageRef_Orientation_Issue-macos-11.golden.webp
diff --git a/resources/png-24bit+alpha.ModulateHSV_Alpha-macos-11.golden.png b/resources/png-24bit+alpha.ModulateHSV_Alpha-macos-11.golden.png
diff --git a/resources/png-24bit+alpha.Modulate_Alpha-macos-11.golden.png b/resources/png-24bit+alpha.Modulate_Alpha-macos-11.golden.png
diff --git a/resources/png-24bit+alpha.Sharpen_24bit_Alpha-macos-11.golden.png b/resources/png-24bit+alpha.Sharpen_24bit_Alpha-macos-11.golden.png
diff --git a/resources/png-24bit+alpha.TestImageRef_Linear_Alpha-macos-11.golden.png b/resources/png-24bit+alpha.TestImageRef_Linear_Alpha-macos-11.golden.png
diff --git a/resources/png-24bit.AutoRotate_0-macos-11.golden.png b/resources/png-24bit.AutoRotate_0-macos-11.golden.png
diff --git a/resources/png-24bit.AutoRotate_0-macos-12.golden.png b/resources/png-24bit.AutoRotate_0-macos-12.golden.png
diff --git a/resources/png-24bit.GetPointWhite-macos-11.golden.png b/resources/png-24bit.GetPointWhite-macos-11.golden.png
diff --git a/resources/png-24bit.GetPointWhite-macos-12.golden.png b/resources/png-24bit.GetPointWhite-macos-12.golden.png
diff --git a/resources/png-24bit.GetPointWhiteR-macos-11.golden.png b/resources/png-24bit.GetPointWhiteR-macos-11.golden.png
diff --git a/resources/png-24bit.GetPointWhiteR-macos-12.golden.png b/resources/png-24bit.GetPointWhiteR-macos-12.golden.png
diff --git a/resources/png-24bit.GetPointYellow-macos-11.golden.png b/resources/png-24bit.GetPointYellow-macos-11.golden.png
diff --git a/resources/png-24bit.GetPointYellow-macos-12.golden.png b/resources/png-24bit.GetPointYellow-macos-12.golden.png
diff --git a/resources/png-24bit.Rank-macos-11.golden.png b/resources/png-24bit.Rank-macos-11.golden.png
diff --git a/resources/png-24bit.Rank-macos-12.golden.png b/resources/png-24bit.Rank-macos-12.golden.png
diff --git a/resources/png-24bit.TestImageRef_Linear1-macos-11.golden.png b/resources/png-24bit.TestImageRef_Linear1-macos-11.golden.png
diff --git a/resources/png-24bit.TestImageRef_Linear1-macos-12.golden.png b/resources/png-24bit.TestImageRef_Linear1-macos-12.golden.png
diff --git a/resources/png-24bit.TestThumbnail_PNG_CropCentered-macos-12.golden.png b/resources/png-24bit.TestThumbnail_PNG_CropCentered-macos-12.golden.png
diff --git a/resources/png-8bit+alpha.Embed_ExtendBackground_Alpha-macos-11.golden.png b/resources/png-8bit+alpha.Embed_ExtendBackground_Alpha-macos-11.golden.png
diff --git a/resources/png-8bit+alpha.Resize_Downscale_Alpha-macos-11.golden.png b/resources/png-8bit+alpha.Resize_Downscale_Alpha-macos-11.golden.png
diff --git a/resources/png-8bit+alpha.Resize_Downscale_Alpha-macos-12.golden.png b/resources/png-8bit+alpha.Resize_Downscale_Alpha-macos-12.golden.png
diff --git a/resources/png-8bit+alpha.Resize_Upscale_Alpha-macos-11.golden.png b/resources/png-8bit+alpha.Resize_Upscale_Alpha-macos-11.golden.png
diff --git a/resources/png-8bit+alpha.Resize_Upscale_Alpha-macos-12.golden.png b/resources/png-8bit+alpha.Resize_Upscale_Alpha-macos-12.golden.png
diff --git a/resources/png-8bit+alpha.Sharpen_8bit_Alpha-macos-11.golden.png b/resources/png-8bit+alpha.Sharpen_8bit_Alpha-macos-11.golden.png
diff --git a/resources/png-8bit.Decode_PNG-macos-11.golden.png b/resources/png-8bit.Decode_PNG-macos-11.golden.png
diff --git a/resources/png-alpha-64bit.PNG_64bit_OptimizeICCProfile-macos-11.golden.png b/resources/png-alpha-64bit.PNG_64bit_OptimizeICCProfile-macos-11.golden.png
diff --git a/resources/png-alpha-64bit.PNG_64bit_OptimizeICCProfile-macos-12.golden.png b/resources/png-alpha-64bit.PNG_64bit_OptimizeICCProfile-macos-12.golden.png
diff --git a/resources/tif.Tiff-macos-11.golden.tiff b/resources/tif.Tiff-macos-11.golden.tiff
diff --git a/resources/with_alpha.ExtractBand-macos-11.golden.png b/resources/with_alpha.ExtractBand-macos-11.golden.png
diff --git a/resources/with_alpha.ExtractBand-macos-12.golden.png b/resources/with_alpha.ExtractBand-macos-12.golden.png
diff --git a/resources/with_alpha.Flatten-macos-11.golden.png b/resources/with_alpha.Flatten-macos-11.golden.png
diff --git a/resources/with_alpha.Flatten-macos-12.golden.png b/resources/with_alpha.Flatten-macos-12.golden.png
diff --git a/resources/with_alpha.GetPoint_WithAlpha-macos-11.golden.png b/resources/with_alpha.GetPoint_WithAlpha-macos-11.golden.png
diff --git a/resources/with_alpha.GetPoint_WithAlpha-macos-12.golden.png b/resources/with_alpha.GetPoint_WithAlpha-macos-12.golden.png
diff --git a/resources/with_alpha.GetPoint_WithAlpha2-macos-11.golden.png b/resources/with_alpha.GetPoint_WithAlpha2-macos-11.golden.png
diff --git a/resources/with_alpha.GetPoint_WithAlpha2-macos-12.golden.png b/resources/with_alpha.GetPoint_WithAlpha2-macos-12.golden.png
diff --git a/vips/image_golden_test.go b/vips/image_golden_test.go
@@ -491,7 +491,7 @@ func TestImage_GaussianBlur(t *testing.T) {
 		return img.GaussianBlur(10.5)
 	}, nil, nil)
 	goldenTest(t, resources+"jpg-24bit.jpg", func(img *ImageRef) error {
-		return img.GaussianBlur(10.5,0.2)
+		return img.GaussianBlur(10.5, 0.2)
 	}, nil, nil)
 }
 
@@ -740,7 +740,7 @@ func TestImage_Black(t *testing.T) {
 	assertGoldenMatch(t, resources+"jpg-24bit.jpg", buf, metadata.Format)
 }
 
-//vips jpegsave resources/jpg-24bit-icc-iec.jpg test.jpg --Q=75 --profile=none --strip --subsample-mode=auto --interlace --optimize-coding
+// vips jpegsave resources/jpg-24bit-icc-iec.jpg test.jpg --Q=75 --profile=none --strip --subsample-mode=auto --interlace --optimize-coding
 func TestImage_OptimizeCoding(t *testing.T) {
 	goldenTest(t, resources+"jpg-24bit-icc-iec.jpg",
 		nil,
@@ -755,7 +755,7 @@ func TestImage_OptimizeCoding(t *testing.T) {
 	)
 }
 
-//vips jpegsave resources/jpg-24bit-icc-iec.jpg test.jpg --Q=75 --profile=none --strip --subsample-mode=on
+// vips jpegsave resources/jpg-24bit-icc-iec.jpg test.jpg --Q=75 --profile=none --strip --subsample-mode=on
 func TestImage_SubsampleMode(t *testing.T) {
 	goldenTest(t, resources+"jpg-24bit-icc-iec.jpg",
 		nil,
@@ -768,7 +768,7 @@ func TestImage_SubsampleMode(t *testing.T) {
 	)
 }
 
-//vips jpegsave resources/jpg-24bit-icc-iec.jpg test.jpg --Q=75 --profile=none --strip --trellis-quant
+// vips jpegsave resources/jpg-24bit-icc-iec.jpg test.jpg --Q=75 --profile=none --strip --trellis-quant
 func TestImage_TrellisQuant(t *testing.T) {
 	goldenTest(t, resources+"jpg-24bit-icc-iec.jpg",
 		nil,
@@ -782,7 +782,7 @@ func TestImage_TrellisQuant(t *testing.T) {
 	)
 }
 
-//vips jpegsave resources/jpg-24bit-icc-iec.jpg test.jpg --Q=75 --profile=none --strip --overshoot-deringing
+// vips jpegsave resources/jpg-24bit-icc-iec.jpg test.jpg --Q=75 --profile=none --strip --overshoot-deringing
 func TestImage_OvershootDeringing(t *testing.T) {
 	goldenTest(t, resources+"jpg-24bit-icc-iec.jpg",
 		nil,
@@ -796,7 +796,7 @@ func TestImage_OvershootDeringing(t *testing.T) {
 	)
 }
 
-//vips jpegsave resources/jpg-24bit-icc-iec.jpg test.jpg --Q=75 --profile=none --strip --interlace --optimize-scans
+// vips jpegsave resources/jpg-24bit-icc-iec.jpg test.jpg --Q=75 --profile=none --strip --interlace --optimize-scans
 func TestImage_OptimizeScans(t *testing.T) {
 	goldenTest(t, resources+"jpg-24bit-icc-iec.jpg",
 		nil,
@@ -811,7 +811,7 @@ func TestImage_OptimizeScans(t *testing.T) {
 	)
 }
 
-//vips jpegsave resources/jpg-24bit-icc-iec.jpg test.jpg --Q=75 --profile=none --strip --quant-table=3
+// vips jpegsave resources/jpg-24bit-icc-iec.jpg test.jpg --Q=75 --profile=none --strip --quant-table=3
 func TestImage_QuantTable(t *testing.T) {
 	goldenTest(t, resources+"jpg-24bit-icc-iec.jpg",
 		nil,

diff --git a/vips/image_test.go b/vips/image_test.go
@@ -20,6 +20,24 @@ func TestMain(m *testing.M) {
 	os.Exit(ret)
 }
 
+func TestDoubleExport(t *testing.T) {
+	Startup(nil)
+
+	srcBytes, err := ioutil.ReadFile(resources + "copyright.jpeg")
+	require.NoError(t, err)
+
+	src := bytes.NewReader(srcBytes)
+	img, err := NewImageFromReader(src)
+	require.NoError(t, err)
+	require.NotNil(t, img)
+
+	_, _, err = img.ExportWebp(nil)
+	assert.NoError(t, err)
+
+	_, _, err = img.ExportPng(nil)
+	assert.NoError(t, err)
+}
+
 func TestImageRef_WebP(t *testing.T) {
 	Startup(nil)