From: glennrp <glennrp@git.imagemagick.org>
Date: Sat, 2 Mar 2013 15:52:36 +0000 (+0000)
Subject: Do not replace gAMA chunk found in input with 1/2.2
X-Git-Tag: 7.0.1-0~4150
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=84288238d90b2e1831857d6b2427abd7875b7e1b;p=imagemagick

Do not replace gAMA chunk found in input with 1/2.2
---

diff --git a/coders/png.c b/coders/png.c
index 699bf0489..c4ad491ac 100644
--- a/coders/png.c
+++ b/coders/png.c
@@ -2557,7 +2557,7 @@ static Image *ReadOnePNGImage(MngInfo *mng_info,
     {
       if (ping_found_sRGB != MagickTrue &&
           (ping_found_gAMA != MagickTrue ||
-          image->gamma < .45 || image->gamma > .46) &&
+          (image->gamma > .45 && image->gamma < .46)) &&
           (ping_found_cHRM != MagickTrue ||
           ping_found_sRGB_cHRM == MagickTrue) &&
           ping_found_iCCP != MagickTrue)
@@ -2565,10 +2565,12 @@ static Image *ReadOnePNGImage(MngInfo *mng_info,
          png_set_sRGB(ping,ping_info,
             Magick_RenderingIntent_to_PNG_RenderingIntent
             (image->rendering_intent));
-         png_set_gAMA(ping,ping_info,1.000f/2.200f);
+         if (ping_found_gAMA != MagickTrue)
+            png_set_gAMA(ping,ping_info,1.000f/2.200f);
          file_gamma=1.000f/2.200f;
          ping_found_sRGB=MagickTrue;
-         ping_found_cHRM=MagickTrue;
+         (void) LogMagickEvent(CoderEvent,GetMagickModule(),
+           "    Setting sRGB and gAMA as if in input");
       }
     }