Merge renaming of mDCv to mDCV and cLLi to cLLI from 'master'.

Author: MarkCallow

lodepng.cpp

@@ -1,7 +1,7 @@
 /*
-LodePNG version 20241228
+LodePNG version 20250506
 
-Copyright (c) 2005-2024 Lode Vandevenne
+Copyright (c) 2005-2025 Lode Vandevenne
 
 This software is provided 'as-is', without any express or implied
 warranty. In no event will the authors be held liable for any damages
@@ -48,7 +48,7 @@ Rename this file to lodepng.cpp to use it for C++, or to lodepng.c to use it for
 #pragma clang diagnostic ignored "-Wshorten-64-to-32" /*implicit conversions*/
 #endif
 
-const char* LODEPNG_VERSION_STRING = "20241228";
+const char* LODEPNG_VERSION_STRING = "20250506";
 
 /*
 This source file is divided into the following large parts. The code sections
@@ -5149,8 +5149,8 @@ static unsigned readChunk_cICP(LodePNGInfo* info, const unsigned char* data, siz
   return 0; /* OK */
 }
 
-static unsigned readChunk_mDCv(LodePNGInfo* info, const unsigned char* data, size_t chunkLength) {
-  if(chunkLength != 24) return 119; /*invalid mDCv chunk size*/
+static unsigned readChunk_mDCV(LodePNGInfo* info, const unsigned char* data, size_t chunkLength) {
+  if(chunkLength != 24) return 119; /*invalid mDCV chunk size*/
 
   info->mdcv_defined = 1;
   info->mdcv_red_x = 256u * data[0] + data[1];
@@ -5167,8 +5167,8 @@ static unsigned readChunk_mDCv(LodePNGInfo* info, const unsigned char* data, siz
   return 0; /* OK */
 }
 
-static unsigned readChunk_cLLi(LodePNGInfo* info, const unsigned char* data, size_t chunkLength) {
-  if(chunkLength != 8) return 120; /*invalid cLLi chunk size*/
+static unsigned readChunk_cLLI(LodePNGInfo* info, const unsigned char* data, size_t chunkLength) {
+  if(chunkLength != 8) return 120; /*invalid cLLI chunk size*/
 
   info->clli_defined = 1;
   info->clli_max_cll = 16777216u * data[0] + 65536u * data[1] + 256u * data[2] + data[3];
@@ -5264,10 +5264,10 @@ unsigned lodepng_inspect_chunk(LodePNGState* state, size_t pos,
     error = readChunk_iCCP(&state->info_png, &state->decoder, data, chunkLength);
   } else if(lodepng_chunk_type_equals(chunk, "cICP")) {
     error = readChunk_cICP(&state->info_png, data, chunkLength);
-  } else if(lodepng_chunk_type_equals(chunk, "mDCv")) {
-    error = readChunk_mDCv(&state->info_png, data, chunkLength);
-  } else if(lodepng_chunk_type_equals(chunk, "cLLi")) {
-    error = readChunk_cLLi(&state->info_png, data, chunkLength);
+  } else if(lodepng_chunk_type_equals(chunk, "mDCV")) {
+    error = readChunk_mDCV(&state->info_png, data, chunkLength);
+  } else if(lodepng_chunk_type_equals(chunk, "cLLI")) {
+    error = readChunk_cLLI(&state->info_png, data, chunkLength);
   } else if(lodepng_chunk_type_equals(chunk, "eXIf")) {
     error = readChunk_eXIf(&state->info_png, data, chunkLength);
   } else if(lodepng_chunk_type_equals(chunk, "sBIT")) {
@@ -5420,11 +5420,11 @@ unsigned lodepng_decode_chunks(void** idat_out, size_t* idatsize_out, unsigned*
     } else if(lodepng_chunk_type_equals(chunk, "cICP")) {
       state->error = readChunk_cICP(&state->info_png, data, chunkLength);
       if(state->error) break;
-    } else if(lodepng_chunk_type_equals(chunk, "mDCv")) {
-      state->error = readChunk_mDCv(&state->info_png, data, chunkLength);
+    } else if(lodepng_chunk_type_equals(chunk, "mDCV")) {
+      state->error = readChunk_mDCV(&state->info_png, data, chunkLength);
       if(state->error) break;
-    } else if(lodepng_chunk_type_equals(chunk, "cLLi")) {
-      state->error = readChunk_cLLi(&state->info_png, data, chunkLength);
+    } else if(lodepng_chunk_type_equals(chunk, "cLLI")) {
+      state->error = readChunk_cLLI(&state->info_png, data, chunkLength);
       if(state->error) break;
     } else if(lodepng_chunk_type_equals(chunk, "eXIf")) {
       state->error = readChunk_eXIf(&state->info_png, data, chunkLength);
@@ -6039,7 +6039,7 @@ static unsigned addChunk_cICP(ucvector* out, const LodePNGInfo* info) {
   return 0;
 }
 
-static unsigned addChunk_mDCv(ucvector* out, const LodePNGInfo* info) {
+static unsigned addChunk_mDCV(ucvector* out, const LodePNGInfo* info) {
   unsigned char* chunk;
   /* Allow up to 65535 since they are 16-bit ints. */
   if(info->mdcv_red_x > 65535) return 118;
@@ -6050,7 +6050,7 @@ static unsigned addChunk_mDCv(ucvector* out, const LodePNGInfo* info) {
   if(info->mdcv_blue_y > 65535) return 118;
   if(info->mdcv_white_x > 65535) return 118;
   if(info->mdcv_white_y > 65535) return 118;
-  CERROR_TRY_RETURN(lodepng_chunk_init(&chunk, out, 24, "mDCv"));
+  CERROR_TRY_RETURN(lodepng_chunk_init(&chunk, out, 24, "mDCV"));
   chunk[8 + 0] = (unsigned char)((info->mdcv_red_x) >> 8u);
   chunk[8 + 1] = (unsigned char)(info->mdcv_red_x);
   chunk[8 + 2] = (unsigned char)((info->mdcv_red_y) >> 8u);
@@ -6073,9 +6073,9 @@ static unsigned addChunk_mDCv(ucvector* out, const LodePNGInfo* info) {
   return 0;
 }
 
-static unsigned addChunk_cLLi(ucvector* out, const LodePNGInfo* info) {
+static unsigned addChunk_cLLI(ucvector* out, const LodePNGInfo* info) {
   unsigned char* chunk;
-  CERROR_TRY_RETURN(lodepng_chunk_init(&chunk, out, 8, "cLLi"));
+  CERROR_TRY_RETURN(lodepng_chunk_init(&chunk, out, 8, "cLLI"));
   lodepng_set32bitInt(chunk + 8 + 0, info->clli_max_cll);
   lodepng_set32bitInt(chunk + 8 + 4, info->clli_max_fall);
   lodepng_chunk_generate_crc(chunk);
@@ -6755,11 +6755,11 @@ unsigned lodepng_encode(unsigned char** out, size_t* outsize,
       if(state->error) goto cleanup;
     }
     if(info.mdcv_defined) {
-      state->error = addChunk_mDCv(&outv, &info);
+      state->error = addChunk_mDCV(&outv, &info);
       if(state->error) goto cleanup;
     }
     if(info.clli_defined) {
-      state->error = addChunk_cLLi(&outv, &info);
+      state->error = addChunk_cLLI(&outv, &info);
       if(state->error) goto cleanup;
     }
     if(info.iccp_defined) {
@@ -7091,9 +7091,9 @@ const char* lodepng_error_text(unsigned code) {
     case 115: return "sBIT value out of range";
     case 116: return "cICP value out of range";
     case 117: return "invalid cICP chunk size";
-    case 118: return "mDCv value out of range";
-    case 119: return "invalid mDCv chunk size";
-    case 120: return "invalid cLLi chunk size";
+    case 118: return "mDCV value out of range";
+    case 119: return "invalid mDCV chunk size";
+    case 120: return "invalid cLLI chunk size";
     case 121: return "invalid chunk type name: may only contain [a-zA-Z]";
     case 122: return "invalid chunk type name: third character must be uppercase";
     case 123: return "destination buffer too small";

lodepng.h

@@ -1,7 +1,7 @@
 /*
-LodePNG version 20241228
+LodePNG version 20250506
 
-Copyright (c) 2005-2024 Lode Vandevenne
+Copyright (c) 2005-2025 Lode Vandevenne
 
 This software is provided 'as-is', without any express or implied
 warranty. In no event will the authors be held liable for any damages
@@ -670,15 +670,15 @@ typedef struct LodePNGInfo {
   unsigned cicp_video_full_range_flag; /* Video full range flag value */
 
   /*
-  mDCv chunk: Mastering Display Color Volume.
+  mDCV chunk: Mastering Display Color Volume.
   Optional, typically used in conjunction with certain HDR color spaces that can
   be represented by the cICP chunk.
   See the PNG specification, third edition, for more information on this chunk.
   All the red, green, blue and white x and y values are encoded as 16-bit
   integers and therefore must be in range 0-65536. The min and max luminance
   values are 32-bit integers.
   */
-  unsigned mdcv_defined; /* Whether a mDCv chunk is present (0 = not present, 1 = present). */
+  unsigned mdcv_defined; /* Whether an mDCV chunk is present (0 = not present, 1 = present). */
   /* Mastering display color primary chromaticities (CIE 1931 x,y of R,G,B) */
   unsigned mdcv_red_x;   /* Red x times 50000 */
   unsigned mdcv_red_y;   /* Red y times 50000 */
@@ -694,13 +694,13 @@ typedef struct LodePNGInfo {
   unsigned mdcv_min_luminance; /* Min luminance in cd/m^2 times 10000 */
 
   /*
-  cLLi chunk: Content Light Level Information.
+  cLLI chunk: Content Light Level Information.
   Optional, typically used in conjunction with certain HDR color spaces that can
   be represented by the cICP chunk.
   See the PNG specification, third edition, for more information on this chunk.
   The clli_max_cll and clli_max_fall values are 32-bit integers.
   */
-  unsigned clli_defined; /* Whether a cLLi chunk is present (0 = not present, 1 = present). */
+  unsigned clli_defined; /* Whether a cLLI chunk is present (0 = not present, 1 = present). */
   unsigned clli_max_cll; /* Maximum Content Light Level (MaxCLL) in cd/m^2 times 10000 */
   unsigned clli_max_fall; /* Maximum Frame-Average Light Level (MaxFALL) in cd/m^2 times 10000 */
 
@@ -1279,7 +1279,7 @@ unsigned compress(std::vector<unsigned char>& out, const std::vector<unsigned ch
 [X] converting color to 16-bit per channel types
 [X] support color profile chunk types (but never let them touch RGB values by default)
 [ ] support all second edition public PNG chunk types (almost done except sPLT and hIST)
-[X] support non-animation third edition public PNG chunk types: eXIf, cICP, mDCv, cLLi
+[X] support non-animation third edition public PNG chunk types: eXIf, cICP, mDCV, cLLI
 [ ] make sure encoder generates no chunks with size > (2^31)-1
 [ ] partial decoding (stream processing)
 [X] let the "isFullyOpaque" function check color keys and transparent palettes too
@@ -2019,12 +2019,13 @@ symbol.
 Not all changes are listed here, the commit history in github lists more:
 https://github.com/lvandeve/lodepng
 
-*) 16 apr 2025: added public lodepng_decode_chunks and lodepng_finish_decode
-   functions. With these a user can separate decode of all the chunks, so as
-   to learn all the details of the file, from decompression, and possible
-   conversion, of the image data.
+*) 6 may 2025: renamed mDCv to mDCV and cLLi to cLLI as per the recent rename
+   in the draft png third edition spec. Please note that while the third
+   edition is not finalized, backwards-incompatible changes to its features are
+   possible.
 *) 16 apr 2025: Separated chunk decoding from image decoding and expansion.
-
+   so a user can first decode all the chunks to learn details of the file
+   then decompress and, possibly, convert the image data.
 *) 23 dec 2024: added support for the mDCv and cLLi chunks (for png third
    edition spec)
 *) 22 dec 2024: added support for the cICP chunk (for png third edition spec)
@@ -2035,7 +2036,7 @@ Not all changes are listed here, the commit history in github lists more:
 *) 27 jun 2021: added warnings that file reading/writing functions don't support
    wide-character filenames (support for this is not planned, opening files is
    not the core part of PNG decoding/decoding and is platform dependent).
-*) 17 okt 2020: prevent decoding too large text/icc chunks by default.
+*) 17 oct 2020: prevent decoding too large text/icc chunks by default.
 *) 06 mar 2020: simplified some of the dynamic memory allocations.
 *) 12 jan 2020: (!) added 'end' argument to lodepng_chunk_next to allow correct
    overflow checks.
@@ -2057,7 +2058,7 @@ Not all changes are listed here, the commit history in github lists more:
 *) 09 apr 2016: Fixed colorkey usage detection, and better file loading (within
    the limits of pure C90).
 *) 08 dec 2015: Made load_file function return error if file can't be opened.
-*) 24 okt 2015: Bugfix with decoding to palette output.
+*) 24 oct 2015: Bugfix with decoding to palette output.
 *) 18 apr 2015: Boundary PM instead of just package-merge for faster encoding.
 *) 24 aug 2014: Moved to github
 *) 23 aug 2014: Reduced needless memory usage of decoder.
@@ -2071,8 +2072,8 @@ Not all changes are listed here, the commit history in github lists more:
     prefix for the custom allocators and made it possible with a new #define to
     use custom ones in your project without needing to change lodepng's code.
 *) 28 jan 2013: Bugfix with color key.
-*) 27 okt 2012: Tweaks in text chunk keyword length error handling.
-*) 8 okt 2012: (!) Added new filter strategy (entropy) and new auto color mode.
+*) 27 oct 2012: Tweaks in text chunk keyword length error handling.
+*) 8 oct 2012: (!) Added new filter strategy (entropy) and new auto color mode.
     (no palette). Better deflate tree encoding. New compression tweak settings.
     Faster color conversions while decoding. Some internal cleanups.
 *) 23 sep 2012: Reduced warnings in Visual Studio a little bit.
@@ -2088,7 +2089,7 @@ Not all changes are listed here, the commit history in github lists more:
 *) 6 nov 2011: (!) By default, the encoder now automatically chooses the best
     PNG color model and bit depth, based on the amount and type of colors of the
     raw image. For this, autoLeaveOutAlphaChannel replaced by auto_choose_color.
-*) 9 okt 2011: simpler hash chain implementation for the encoder.
+*) 9 oct 2011: simpler hash chain implementation for the encoder.
 *) 8 sep 2011: lz77 encoder lazy matching instead of greedy matching.
 *) 23 aug 2011: tweaked the zlib compression parameters after benchmarking.
     A bug with the PNG filtertype heuristic was fixed, so that it chooses much
@@ -2103,8 +2104,8 @@ Not all changes are listed here, the commit history in github lists more:
 *) 13 nov 2010: added LodePNG_InfoColor_hasPaletteAlpha and
     LodePNG_InfoColor_canHaveAlpha functions for convenience.
 *) 7 nov 2010: added LodePNG_error_text function to get error code description.
-*) 30 okt 2010: made decoding slightly faster
-*) 26 okt 2010: (!) changed some C function and struct names (more consistent).
+*) 30 oct 2010: made decoding slightly faster
+*) 26 oct 2010: (!) changed some C function and struct names (more consistent).
      Reorganized the documentation and the declaration order in the header.
 *) 08 aug 2010: only changed some comments and external samples.
 *) 05 jul 2010: fixed bug thanks to warnings in the new gcc version.
@@ -2163,8 +2164,8 @@ Not all changes are listed here, the commit history in github lists more:
     Removed some code duplication in the decoder. Fixed little bug in an example.
 *) 09 dec 2006: (!) Placed output parameters of public functions as first parameter.
     Fixed a bug of the decoder with 16-bit per color.
-*) 15 okt 2006: Changed documentation structure
-*) 09 okt 2006: Encoder class added. It encodes a valid PNG image from the
+*) 15 oct 2006: Changed documentation structure
+*) 09 oct 2006: Encoder class added. It encodes a valid PNG image from the
     given image buffer, however for now it's not compressed.
 *) 08 sep 2006: (!) Changed to interface with a Decoder class
 *) 30 jul 2006: (!) LodePNG_InfoPng , width and height are now retrieved in different