commit 71a3c1f8214ed88636a7beb1a26057ea6220978c
author Glenn Randers-Pehrson <glennrp at users.sourceforge.net> Wed Nov 26 12:00:38 2008 -0600
committer Glenn Randers-Pehrson <glennrp at users.sourceforge.net> Mon Apr 06 16:10:44 2009 -0500
tree 0593fa160b02250fb1ff8755318c481e3f38a6e2
parent 02a5e33061ff98d210a3a535e7f3af626e6d73db

Imported from libpng-1.4.0beta41.tar

pngset.c

diff --git a/pngset.c b/pngset.c
index ad376fd..fe79794 100644
--- a/pngset.c
+++ b/pngset.c
@@ -1,7 +1,7 @@
 
 /* pngset.c - storage of image information into info struct
  *
- * Last changed in libpng 1.4.0 [November 25, 2008]
+ * Last changed in libpng 1.4.0 [November 26, 2008]
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1998-2008 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@@ -74,8 +74,10 @@
    if (png_ptr == NULL || info_ptr == NULL)
       return;
 
+#if !defined(PNG_NO_CHECK_cHRM)
    if (png_check_cHRM_fixed(png_ptr,
       white_x, white_y, red_x, red_y, green_x, green_y, blue_x, blue_y))
+#endif
    {
      info_ptr->int_x_white = white_x;
      info_ptr->int_y_white = white_y;
@@ -616,9 +618,11 @@
    blue_y  = (float).06;
 #endif
 
+#if !defined(PNG_NO_CHECK_cHRM)
    if (png_check_cHRM_fixed(png_ptr,
       int_white_x, int_white_y, int_red_x, int_red_y, int_green_x,
       int_green_y, int_blue_x, int_blue_y))
+#endif
    {
 #ifdef PNG_FIXED_POINT_SUPPORTED
      png_set_cHRM_fixed(png_ptr, info_ptr,