diff --git a/processing/import_color_profile.go b/processing/colorspace_to_processing.go similarity index 87% rename from processing/import_color_profile.go rename to processing/colorspace_to_processing.go index 77e7d999..e670d642 100644 --- a/processing/import_color_profile.go +++ b/processing/colorspace_to_processing.go @@ -7,7 +7,7 @@ import ( "github.com/imgproxy/imgproxy/v3/vips" ) -func importColorProfile(pctx *pipelineContext, img *vips.Image, po *options.ProcessingOptions, imgdata *imagedata.ImageData) error { +func colorspaceToProcessing(pctx *pipelineContext, img *vips.Image, po *options.ProcessingOptions, imgdata *imagedata.ImageData) error { if img.ColourProfileImported() { return nil } diff --git a/processing/export_color_profile.go b/processing/colorspace_to_result.go similarity index 95% rename from processing/export_color_profile.go rename to processing/colorspace_to_result.go index df672bad..95aa486c 100644 --- a/processing/export_color_profile.go +++ b/processing/colorspace_to_result.go @@ -6,7 +6,7 @@ import ( "github.com/imgproxy/imgproxy/v3/vips" ) -func exportColorProfile(pctx *pipelineContext, img *vips.Image, po *options.ProcessingOptions, imgdata *imagedata.ImageData) error { +func colorspaceToResult(pctx *pipelineContext, img *vips.Image, po *options.ProcessingOptions, imgdata *imagedata.ImageData) error { keepProfile := !po.StripColorProfile && po.Format.SupportsColourProfile() if img.IsLinear() { diff --git a/processing/processing.go b/processing/processing.go index 73f21203..5abbe38a 100644 --- a/processing/processing.go +++ b/processing/processing.go @@ -22,7 +22,7 @@ var mainPipeline = pipeline{ trim, prepare, scaleOnLoad, - importColorProfile, + colorspaceToProcessing, crop, scale, rotateAndFlip, @@ -37,7 +37,7 @@ var mainPipeline = pipeline{ } var finalizePipeline = pipeline{ - exportColorProfile, + colorspaceToResult, stripMetadata, } diff --git a/processing/trim.go b/processing/trim.go index 77cd72a6..fc8b2f68 100644 --- a/processing/trim.go +++ b/processing/trim.go @@ -25,7 +25,7 @@ func trim(pctx *pipelineContext, img *vips.Image, po *options.ProcessingOptions, } // We need to import color profile before trim - if err := importColorProfile(pctx, img, po, imgdata); err != nil { + if err := colorspaceToProcessing(pctx, img, po, imgdata); err != nil { return err } diff --git a/processing/watermark.go b/processing/watermark.go index 7ad37e77..ac911ea3 100644 --- a/processing/watermark.go +++ b/processing/watermark.go @@ -14,7 +14,7 @@ import ( var watermarkPipeline = pipeline{ prepare, scaleOnLoad, - importColorProfile, + colorspaceToProcessing, scale, rotateAndFlip, padding, diff --git a/vips/vips.c b/vips/vips.c index c17d98d1..481cfca4 100644 --- a/vips/vips.c +++ b/vips/vips.c @@ -407,6 +407,7 @@ vips_icc_is_srgb_iec61966(VipsImage *in) /* Predict it is sRGB IEC61966 2.1 by checking some header fields */ return ((memcmp(data + 48, "IEC ", 4) == 0) && // Device manufacturer + (memcmp(data + 16, "RGB ", 4) == 0) && // Colorspace (memcmp(data + 52, "sRGB", 4) == 0) && // Device model (memcmp(data + 80, "HP ", 4) == 0) && // Profile creator (memcmp(data + 24, date, 6) == 0) && // Date of creation