Merge pull request #231 from wix-incubator/optimize-icc-16bit-fix

Fix OptimizeICCProfile for 16-bit images

vips/image.go

@@ -1090,7 +1090,12 @@ func (r *ImageRef) OptimizeICCProfile() error {
 
 	embedded := r.HasICCProfile() && (inputProfile == "")
 
-	out, err := vipsICCTransform(r.image, r.optimizedIccProfile, inputProfile, IntentPerceptual, 0, embedded)
+	depth := 16
+	if r.BandFormat() == BandFormatUchar || r.BandFormat() == BandFormatChar || r.BandFormat() == BandFormatNotSet {
+		depth = 8
+	}
+
+	out, err := vipsICCTransform(r.image, r.optimizedIccProfile, inputProfile, IntentPerceptual, depth, embedded)
 	if err != nil {
 		govipsLog("govips", LogLevelError, fmt.Sprintf("failed to do icc transform: %v", err.Error()))
 		return err

vips/image_golden_test.go

@@ -17,6 +17,15 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
+func TestImage_PNG_64bit_OptimizeICCProfile(t *testing.T) {
+	goldenTest(t, resources+"png-alpha-64bit.png",
+		func(img *ImageRef) error {
+			return img.OptimizeICCProfile()
+		},
+		nil,
+		exportPng(NewPngExportParams()))
+}
+
 func TestImage_Resize_Downscale(t *testing.T) {
 	goldenTest(t, resources+"jpg-24bit.jpg",
 		func(img *ImageRef) error {
@@ -746,6 +755,12 @@ func exportJpeg(exportParams *JpegExportParams) func(img *ImageRef) ([]byte, *Im
 	}
 }
 
+func exportPng(exportParams *PngExportParams) func(img *ImageRef) ([]byte, *ImageMetadata, error) {
+	return func(img *ImageRef) ([]byte, *ImageMetadata, error) {
+		return img.ExportPng(exportParams)
+	}
+}
+
 func goldenTest(
 	t *testing.T,
 	path string,