highperfocused/imgproxy
1
0
Fork 0
mirror of https://github.com/imgproxy/imgproxy.git synced 2025-10-04 10:29:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into version/4

Browse Source
This commit is contained in:
DarthSim
2025-08-20 17:01:34 +03:00
parent 14bb84fa1f 83e64ff2d3
commit 08d20d46e6
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
processing/colorspace_to_result.go
View File

@@ -36,7 +36,7 @@ func colorspaceToResult(pctx *pipelineContext, img *vips.Image, po *options.Proc
} else if !keepProfile { } else if !keepProfile {
// We don't import ICC profile and don't want to keep it, // We don't import ICC profile and don't want to keep it,
// so we need to transform it to sRGB for maximum compatibility // 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 return err
} }
} }

2
vips/vips.c
View File

@@ -563,7 +563,7 @@ vips_icc_export_srgb(VipsImage *in, VipsImage **out)
} }
int 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); return vips_icc_transform(in, out, "sRGB", "embedded", TRUE, "pcs", vips_icc_get_pcs(in), NULL);
} }

6
vips/vips.go
View File

@@ -856,7 +856,7 @@ func (img *Image) ExportColourProfileToSRGB() error {
return nil return nil
} }
func (img *Image) TransformColourProfile() error { func (img *Image) TransformColourProfileToSRGB() error {
var tmp *C.VipsImage var tmp *C.VipsImage
// Don't transform is there's no embedded profile or embedded profile is sRGB // 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 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) C.swap_and_clear(&img.VipsImage, tmp)
} else { } else {
log.Warningf("Can't transform ICC profile: %s", Error()) log.Warningf("Can't transform ICC profile to sRGB: %s", Error())
} }
return nil return nil

2
vips/vips.h
View File

@@ -65,7 +65,7 @@ int vips_icc_restore(VipsImage *in, VipsImage **out);
int vips_icc_import_go(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_go(VipsImage *in, VipsImage **out);
int vips_icc_export_srgb(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_icc_remove(VipsImage *in, VipsImage **out);
int vips_colourspace_go(VipsImage *in, VipsImage **out, VipsInterpretation cs); int vips_colourspace_go(VipsImage *in, VipsImage **out, VipsInterpretation cs);