Merge pull request #630 from ctruta/libpng18

Testing pull request
pnggroup · Jan 2, 2025 · 05f7804 · 05f7804
2 parents 6184164 + 4a5345a
commit 05f7804
Show file tree

Hide file tree

Showing 12 changed files with 88 additions and 76 deletions.
diff --git a/LICENSE.md b/LICENSE.md
@@ -4,8 +4,8 @@ COPYRIGHT NOTICE, DISCLAIMER, and LICENSE
 PNG Reference Library License version 2
 ---------------------------------------
 
- * Copyright (c) 1995-2024 The PNG Reference Library Authors.
- * Copyright (c) 2018-2024 Cosmin Truta.
+ * Copyright (c) 1995-2025 The PNG Reference Library Authors.
+ * Copyright (c) 2018-2025 Cosmin Truta.
  * Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson.
  * Copyright (c) 1996-1997 Andreas Dilger.
  * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.

diff --git a/png.c b/png.c
@@ -1,6 +1,6 @@
 /* png.c - location for general purpose libpng functions
  *
- * Copyright (c) 2018-2024 Cosmin Truta
+ * Copyright (c) 2018-2025 Cosmin Truta
  * Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson
  * Copyright (c) 1996-1997 Andreas Dilger
  * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
@@ -771,7 +771,7 @@ png_get_copyright(png_const_structrp png_ptr)
 #else
    return PNG_STRING_NEWLINE \
       "libpng version 1.8.0.git" PNG_STRING_NEWLINE \
-      "Copyright (c) 2018-2024 Cosmin Truta" PNG_STRING_NEWLINE \
+      "Copyright (c) 2018-2025 Cosmin Truta" PNG_STRING_NEWLINE \
       "Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson" \
       PNG_STRING_NEWLINE \
       "Copyright (c) 1996-1997 Andreas Dilger" PNG_STRING_NEWLINE \

diff --git a/png.h b/png.h
@@ -2,7 +2,7 @@
  *
  * libpng version 1.8.0.git
  *
- * Copyright (c) 2018-2024 Cosmin Truta
+ * Copyright (c) 2018-2025 Cosmin Truta
  * Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson
  * Copyright (c) 1996-1997 Andreas Dilger
  * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
@@ -26,8 +26,8 @@
  * PNG Reference Library License version 2
  * ---------------------------------------
  *
- *  * Copyright (c) 1995-2024 The PNG Reference Library Authors.
- *  * Copyright (c) 2018-2024 Cosmin Truta.
+ *  * Copyright (c) 1995-2025 The PNG Reference Library Authors.
+ *  * Copyright (c) 2018-2025 Cosmin Truta.
  *  * Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson.
  *  * Copyright (c) 1996-1997 Andreas Dilger.
  *  * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.

diff --git a/pngpread.c b/pngpread.c
@@ -312,8 +312,8 @@ png_push_read_chunk(png_structrp png_ptr, png_inforp info_ptr)
 #ifdef PNG_READ_cICP_SUPPORTED
    else if (png_ptr->chunk_name == png_cICP)
    {
-       PNG_PUSH_SAVE_BUFFER_IF_FULL
-       png_handle_cICP(png_ptr, info_ptr, png_ptr->push_length);
+      PNG_PUSH_SAVE_BUFFER_IF_FULL
+      png_handle_cICP(png_ptr, info_ptr, png_ptr->push_length);
    }
 
 #endif

diff --git a/pngread.c b/pngread.c
@@ -184,7 +184,7 @@ png_read_info(png_structrp png_ptr, png_inforp info_ptr)
 #endif
 #ifdef PNG_READ_cICP_SUPPORTED
       else if (chunk_name == png_cICP)
-          png_handle_cICP(png_ptr, info_ptr, length);
+         png_handle_cICP(png_ptr, info_ptr, length);
 #endif
 
 #ifdef PNG_READ_eXIf_SUPPORTED

diff --git a/pngrutil.c b/pngrutil.c
@@ -2047,36 +2047,40 @@ png_handle_bKGD(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
 void /* PRIVATE */
 png_handle_cICP(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
 {
-    png_byte buf[4];
+   png_byte buf[4];
 
-    png_debug(1, "in png_handle_cICP");
+   png_debug(1, "in png_handle_cICP");
 
-    if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
-        png_chunk_error(png_ptr, "missing IHDR");
+   if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
+      png_chunk_error(png_ptr, "missing IHDR");
 
-    else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_cICP) != 0)
-    {
-        png_crc_finish(png_ptr, length);
-        png_chunk_benign_error(png_ptr, "duplicate");
-        return;
-    }
+   else if ((png_ptr->mode & (PNG_HAVE_IDAT|PNG_HAVE_PLTE)) != 0)
+   {
+      png_crc_finish(png_ptr, length);
+      png_chunk_benign_error(png_ptr, "out of place");
+      return;
+   }
 
-    if ((png_ptr->mode & PNG_HAVE_IDAT) != 0)
-        png_ptr->mode |= PNG_AFTER_IDAT;
+   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_cICP) != 0)
+   {
+      png_crc_finish(png_ptr, length);
+      png_chunk_benign_error(png_ptr, "duplicate");
+      return;
+   }
 
-    if (length != 4)
-    {
-        png_crc_finish(png_ptr, length);
-        png_chunk_benign_error(png_ptr, "invalid");
-        return;
-    }
+   else if (length != 4)
+   {
+      png_crc_finish(png_ptr, length);
+      png_chunk_benign_error(png_ptr, "invalid");
+      return;
+   }
 
-    png_crc_read(png_ptr, buf, 4);
+   png_crc_read(png_ptr, buf, 4);
 
-    if (png_crc_finish(png_ptr, 0) != 0)
-        return;
+   if (png_crc_finish(png_ptr, 0) != 0)
+      return;
 
-    png_set_cICP(png_ptr, info_ptr, buf[0], buf[1],  buf[2], buf[3]);
+   png_set_cICP(png_ptr, info_ptr, buf[0], buf[1],  buf[2], buf[3]);
 }
 #endif
 

diff --git a/pngset.c b/pngset.c
@@ -135,21 +135,27 @@ png_set_cHRM_XYZ(png_const_structrp png_ptr, png_inforp info_ptr, double red_X,
 
 #ifdef PNG_cICP_SUPPORTED
 void PNGAPI
-png_set_cICP(png_const_structrp png_ptr,
-             png_inforp info_ptr, png_byte colour_primaries,
-             png_byte transfer_function, png_byte matrix_coefficients,
-             png_byte video_full_range_flag)
+png_set_cICP(png_const_structrp png_ptr, png_inforp info_ptr,
+             png_byte colour_primaries, png_byte transfer_function,
+             png_byte matrix_coefficients, png_byte video_full_range_flag)
 {
-    png_debug1(1, "in %s storage function", "cICP");
+   png_debug1(1, "in %s storage function", "cICP");
 
-    if (png_ptr == NULL || info_ptr == NULL)
-        return;
+   if (png_ptr == NULL || info_ptr == NULL)
+      return;
+
+   info_ptr->cicp_colour_primaries = colour_primaries;
+   info_ptr->cicp_transfer_function = transfer_function;
+   info_ptr->cicp_matrix_coefficients = matrix_coefficients;
+   info_ptr->cicp_video_full_range_flag = video_full_range_flag;
+
+   if (info_ptr->cicp_matrix_coefficients != 0)
+   {
+      png_warning(png_ptr, "Invalid cICP matrix coefficients");
+      return;
+   }
 
-    info_ptr->cicp_colour_primaries = colour_primaries;
-    info_ptr->cicp_transfer_function = transfer_function;
-    info_ptr->cicp_matrix_coefficients = matrix_coefficients;
-    info_ptr->cicp_video_full_range_flag = video_full_range_flag;
-    info_ptr->valid |= PNG_INFO_cICP;
+   info_ptr->valid |= PNG_INFO_cICP;
 }
 #endif /* cICP */
 

diff --git a/pngtest.c b/pngtest.c
@@ -1207,21 +1207,19 @@ test_one_file(const char *inname, const char *outname)
    }
 #endif
 #ifdef PNG_cICP_SUPPORTED
-    {
-        png_byte colour_primaries;
-        png_byte transfer_function;
-        png_byte matrix_coefficients;
-        png_byte video_full_range_flag;
-
-        if (png_get_cICP(read_ptr, read_info_ptr, &colour_primaries,
-                         &transfer_function, &matrix_coefficients,
-                         &video_full_range_flag) != 0)
-#ifdef PNG_WRITE_cICP_SUPPORTED
-            png_set_cICP(write_ptr, write_info_ptr, colour_primaries,
-                         transfer_function, matrix_coefficients,
-                         video_full_range_flag);
-#endif
-    }
+   {
+      png_byte colour_primaries;
+      png_byte transfer_function;
+      png_byte matrix_coefficients;
+      png_byte video_full_range_flag;
+
+      if (png_get_cICP(read_ptr, read_info_ptr,
+                       &colour_primaries, &transfer_function,
+                       &matrix_coefficients, &video_full_range_flag) != 0)
+         png_set_cICP(write_ptr, write_info_ptr,
+                      colour_primaries, transfer_function,
+                      matrix_coefficients, video_full_range_flag);
+   }
 #endif
 #ifdef PNG_READ_eXIf_SUPPORTED
    {

diff --git a/pngwrite.c b/pngwrite.c
@@ -237,13 +237,14 @@ png_write_info(png_structrp png_ptr, png_const_inforp info_ptr)
 #endif
 
 #ifdef PNG_WRITE_cICP_SUPPORTED
-    if ((info_ptr->valid & PNG_INFO_cICP) != 0)
-    {
-        png_write_cICP(png_ptr, info_ptr->cicp_colour_primaries,
-                       info_ptr->cicp_transfer_function,
-                       info_ptr->cicp_matrix_coefficients,
-                       info_ptr->cicp_video_full_range_flag);
-    }
+   if ((info_ptr->valid & PNG_INFO_cICP) != 0)
+   {
+      png_write_cICP(png_ptr,
+                     info_ptr->cicp_colour_primaries,
+                     info_ptr->cicp_transfer_function,
+                     info_ptr->cicp_matrix_coefficients,
+                     info_ptr->cicp_video_full_range_flag);
+   }
 #endif
 
 #ifdef PNG_WRITE_eXIf_SUPPORTED

diff --git a/pngwutil.c b/pngwutil.c
@@ -1495,16 +1495,19 @@ png_write_cICP(png_structrp png_ptr,
                png_byte colour_primaries, png_byte transfer_function,
                png_byte matrix_coefficients, png_byte video_full_range_flag)
 {
-    png_debug(1, "in png_write_cICP");
+   png_byte buf[4];
+
+   png_debug(1, "in png_write_cICP");
 
-    png_write_chunk_header(png_ptr, png_cICP, 4);
+   png_write_chunk_header(png_ptr, png_cICP, 4);
 
-    png_write_chunk_data(png_ptr, &colour_primaries, 1);
-    png_write_chunk_data(png_ptr, &transfer_function, 1);
-    png_write_chunk_data(png_ptr, &matrix_coefficients, 1);
-    png_write_chunk_data(png_ptr, &video_full_range_flag, 1);
+   buf[0] = colour_primaries;
+   buf[1] = transfer_function;
+   buf[2] = matrix_coefficients;
+   buf[3] = video_full_range_flag;
+   png_write_chunk_data(png_ptr, buf, 4);
 
-    png_write_chunk_end(png_ptr);
+   png_write_chunk_end(png_ptr);
 }
 #endif
 

diff --git a/scripts/pnglibconf.dfa b/scripts/pnglibconf.dfa
@@ -8,7 +8,7 @@ com pnglibconf.h - library build configuration
 com
 version
 com
-com Copyright (c) 2018-2024 Cosmin Truta
+com Copyright (c) 2018-2025 Cosmin Truta
 com Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson
 com
 com This code is released under the libpng license.
@@ -711,7 +711,7 @@ option TARGET_SPECIFIC_CODE requires READ
 # Ancillary chunks
 chunk bKGD
 chunk cHRM enables COLORSPACE
-chunk cICP
+chunk cICP enables COLORSPACE, GAMMA
 chunk eXIf
 chunk gAMA enables GAMMA
 chunk hIST

diff --git a/scripts/pnglibconf.h.prebuilt b/scripts/pnglibconf.h.prebuilt
@@ -2,7 +2,7 @@
 
 /* libpng version 1.8.0.git */
 
-/* Copyright (c) 2018-2024 Cosmin Truta */
+/* Copyright (c) 2018-2025 Cosmin Truta */
 /* Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson */
 
 /* This code is released under the libpng license. */