Merge branch 'master' into version/4

processing/colorspace_to_result.go

@@ -36,7 +36,7 @@ func colorspaceToResult(pctx *pipelineContext, img *vips.Image, po *options.Proc
 	} else if !keepProfile {
 		// We don't import ICC profile and don't want to keep it,
 		// so we need to transform it to sRGB for maximum compatibility
-		if err := img.TransformColourProfile(); err != nil {
+		if err := img.TransformColourProfileToSRGB(); err != nil {
 			return err
 		}
 	}

vips/vips.c

@@ -563,7 +563,7 @@ vips_icc_export_srgb(VipsImage *in, VipsImage **out)
 }
 
 int
-vips_icc_transform_go(VipsImage *in, VipsImage **out)
+vips_icc_transform_srgb(VipsImage *in, VipsImage **out)
 {
   return vips_icc_transform(in, out, "sRGB", "embedded", TRUE, "pcs", vips_icc_get_pcs(in), NULL);
 }

vips/vips.go

@@ -856,7 +856,7 @@ func (img *Image) ExportColourProfileToSRGB() error {
 	return nil
 }
 
-func (img *Image) TransformColourProfile() error {
+func (img *Image) TransformColourProfileToSRGB() error {
 	var tmp *C.VipsImage
 
 	// Don't transform is there's no embedded profile or embedded profile is sRGB
@@ -866,10 +866,10 @@ func (img *Image) TransformColourProfile() error {
 		return nil
 	}
 
-	if C.vips_icc_transform_go(img.VipsImage, &tmp) == 0 {
+	if C.vips_icc_transform_srgb(img.VipsImage, &tmp) == 0 {
 		C.swap_and_clear(&img.VipsImage, tmp)
 	} else {
-		log.Warningf("Can't transform ICC profile: %s", Error())
+		log.Warningf("Can't transform ICC profile to sRGB: %s", Error())
 	}
 
 	return nil

vips/vips.h

@@ -65,7 +65,7 @@ int vips_icc_restore(VipsImage *in, VipsImage **out);
 int vips_icc_import_go(VipsImage *in, VipsImage **out);
 int vips_icc_export_go(VipsImage *in, VipsImage **out);
 int vips_icc_export_srgb(VipsImage *in, VipsImage **out);
-int vips_icc_transform_go(VipsImage *in, VipsImage **out);
+int vips_icc_transform_srgb(VipsImage *in, VipsImage **out);
 int vips_icc_remove(VipsImage *in, VipsImage **out);
 int vips_colourspace_go(VipsImage *in, VipsImage **out, VipsInterpretation cs);