From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Sun, 25 May 2003 17:46:34 +0000 (+0000)
Subject: (png_load): Remove `unused vars intent, image_gamma' warning.
X-Git-Tag: ttn-vms-21-2-B4~9942
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8972820c930609390ad70db7e20adfbf2a447b7f;p=emacs.git

(png_load): Remove `unused vars intent, image_gamma' warning.
---

diff --git a/src/xfns.c b/src/xfns.c
index 107ed6dd3a8..4e66e6ef782 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -7579,8 +7579,7 @@ png_load (f, img)
   png_byte channels;
   png_uint_32 row_bytes;
   int transparent_p;
-  double screen_gamma, image_gamma;
-  int intent;
+  double screen_gamma;
   struct png_memory_storage tbr;  /* Data to be read */
 
   /* Find out what file to load.  */
@@ -7719,19 +7718,22 @@ png_load (f, img)
   screen_gamma = (f->gamma ? 1 / f->gamma / 0.45455 : 2.2);
 
 #if 0 /* Avoid double gamma correction for PNG images. */
-  /* Tell the PNG lib to handle gamma correction for us.  */
+  { /* Tell the PNG lib to handle gamma correction for us.  */
+    int intent;
+    double image_gamma;
 #if defined(PNG_READ_sRGB_SUPPORTED) || defined(PNG_WRITE_sRGB_SUPPORTED)
-  if (png_get_sRGB (png_ptr, info_ptr, &intent))
-    /* The libpng documentation says this is right in this case.  */
-    png_set_gamma (png_ptr, screen_gamma, 0.45455);
-  else
+    if (png_get_sRGB (png_ptr, info_ptr, &intent))
+      /* The libpng documentation says this is right in this case.  */
+      png_set_gamma (png_ptr, screen_gamma, 0.45455);
+    else
 #endif
-  if (png_get_gAMA (png_ptr, info_ptr, &image_gamma))
-    /* Image contains gamma information.  */
-    png_set_gamma (png_ptr, screen_gamma, image_gamma);
-  else
-    /* Use the standard default for the image gamma.  */
-    png_set_gamma (png_ptr, screen_gamma, 0.45455);
+      if (png_get_gAMA (png_ptr, info_ptr, &image_gamma))
+	/* Image contains gamma information.  */
+	png_set_gamma (png_ptr, screen_gamma, image_gamma);
+      else
+	/* Use the standard default for the image gamma.  */
+	png_set_gamma (png_ptr, screen_gamma, 0.45455);
+  }
 #endif /* if 0 */
 
   /* Handle alpha channel by combining the image with a background