From 775090fdda30c18542d19d7dcf7a804ea773e597 Mon Sep 17 00:00:00 2001 From: Romain Guy Date: Fri, 15 Oct 2021 17:30:06 -0700 Subject: [PATCH] Re-fix tests --- libs/imageio/src/ImageDecoder.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libs/imageio/src/ImageDecoder.cpp b/libs/imageio/src/ImageDecoder.cpp index 7336e9ef4d..b0126a167b 100644 --- a/libs/imageio/src/ImageDecoder.cpp +++ b/libs/imageio/src/ImageDecoder.cpp @@ -234,10 +234,14 @@ LinearImage PNGDecoder::decode() { png_set_tRNS_to_alpha(mPNG); } if (getColorSpace() == ImageDecoder::ColorSpace::SRGB) { - png_set_alpha_mode(mPNG, PNG_ALPHA_PNG, PNG_DEFAULT_sRGB); + double gamma = 1.0; + png_get_gAMA(mPNG, mInfo, &gamma); + if (gamma != 1.0) { + png_set_alpha_mode(mPNG, PNG_ALPHA_PNG, PNG_DEFAULT_sRGB); + } } else { - png_set_alpha_mode(mPNG, PNG_ALPHA_PNG, PNG_GAMMA_LINEAR); png_set_gamma_fixed(mPNG, PNG_FP_1, PNG_FP_1); + png_set_alpha_mode(mPNG, PNG_ALPHA_PNG, PNG_GAMMA_LINEAR); } if (bitDepth < 16) { png_set_expand_16(mPNG);