relative intent and grayscale ICC support, and minor fixes

Author: lvandeve

lodepng.cpp

@@ -1,7 +1,7 @@
 /*
-LodePNG version 20181230
+LodePNG version 20190210
 
-Copyright (c) 2005-2018 Lode Vandevenne
+Copyright (c) 2005-2019 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
@@ -30,16 +30,16 @@ Rename this file to lodepng.cpp to use it for C++, or to lodepng.c to use it for
 
 #include "lodepng.h"
 
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <limits.h> /* LONG_MAX */
+#include <stdio.h> /* file handling */
+#include <stdlib.h> /* allocations */
 
 #if defined(_MSC_VER) && (_MSC_VER >= 1310) /*Visual Studio: A few warning types are not desired here.*/
 #pragma warning( disable : 4244 ) /*implicit conversions: not warned by gcc -Wall -Wextra and requires too much casts*/
 #pragma warning( disable : 4996 ) /*VS does not like fopen, but fopen_s is not standard C so unusable here*/
 #endif /*_MSC_VER */
 
-const char* LODEPNG_VERSION_STRING = "20181230";
+const char* LODEPNG_VERSION_STRING = "20190210";
 
 /*
 This source file is built up in the following large parts. The code sections
@@ -2685,6 +2685,7 @@ static unsigned lodepng_assign_icc(LodePNGInfo* info, const char* name, const un
 
 unsigned lodepng_set_icc(LodePNGInfo* info, const char* name, const unsigned char* profile, unsigned profile_size) {
   if(info->iccp_name) lodepng_clear_icc(info);
+  info->iccp_defined = 1;
 
   return lodepng_assign_icc(info, name, profile, profile_size);
 }
@@ -2694,6 +2695,7 @@ void lodepng_clear_icc(LodePNGInfo* info) {
   lodepng_free(info->iccp_profile);
   info->iccp_profile = NULL;
   info->iccp_profile_size = 0;
+  info->iccp_defined = 0;
 }
 #endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/
 
@@ -4329,8 +4331,10 @@ static void decodeGeneric(unsigned char** out, unsigned* w, unsigned* h,
   unsigned critical_pos = 1; /*1 = after IHDR, 2 = after PLTE, 3 = after IDAT*/
 #endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/
 
-  /*provide some proper output values if error will happen*/
+
+  /* safe output values in case error happens */
   *out = 0;
+  *w = *h = 0;
 
   state->error = lodepng_inspect(w, h, state, in, insize); /*reads header and resets other parameters in state->info_png*/
   if(state->error) return;
@@ -4562,6 +4566,9 @@ unsigned lodepng_decode_file(unsigned char** out, unsigned* w, unsigned* h, cons
   unsigned char* buffer = 0;
   size_t buffersize;
   unsigned error;
+  /* safe output values in case error happens */
+  *out = 0;
+  *w = *h = 0;
   error = lodepng_load_file(&buffer, &buffersize, filename);
   if(!error) error = lodepng_decode_memory(out, w, h, buffer, buffersize, colortype, bitdepth);
   lodepng_free(buffer);
@@ -5913,6 +5920,8 @@ unsigned decode(std::vector<unsigned char>& out, unsigned& w, unsigned& h,
 unsigned decode(std::vector<unsigned char>& out, unsigned& w, unsigned& h, const std::string& filename,
                 LodePNGColorType colortype, unsigned bitdepth) {
   std::vector<unsigned char> buffer;
+  /* safe output values in case error happens */
+  w = h = 0;
   unsigned error = load_file(buffer, filename);
   if(error) return error;
   return decode(out, w, h, buffer, colortype, bitdepth);

lodepng.h

@@ -1,7 +1,7 @@
 /*
-LodePNG version 20181230
+LodePNG version 20190210
 
-Copyright (c) 2005-2018 Lode Vandevenne
+Copyright (c) 2005-2019 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
@@ -1037,7 +1037,7 @@ unsigned compress(std::vector<unsigned char>& out, const std::vector<unsigned ch
 [ ] make warnings like: oob palette, checksum fail, data after iend, wrong/unknown crit chunk, no null terminator in text, ...
 [ ] error messages with line numbers (and version)
 [ ] errors in state instead of as return code?
-[ ] new errors/warnings like suspiciously big decompressed ztxt or iccp chunk 
+[ ] new errors/warnings like suspiciously big decompressed ztxt or iccp chunk
 [ ] let the C++ wrapper catch exceptions coming from the standard library and return LodePNG error codes
 [ ] allow user to provide custom color conversion functions, e.g. for premultiplied alpha, padding bits or not, ...
 [ ] allow user to give data (void*) to custom allocator
@@ -1915,5 +1915,5 @@ Domain: gmail dot com.
 Account: lode dot vandevenne.
 
 
-Copyright (c) 2005-2018 Lode Vandevenne
+Copyright (c) 2005-2019 Lode Vandevenne
 */

lodepng_unittest.cpp

@@ -42,7 +42,7 @@ mv lodepng.cpp lodepng.c ; gcc -I ./ lodepng.c examples/example_decode.c -pedant
 
 *) try lodepng_benchmark.cpp
 g++ lodepng.cpp lodepng_benchmark.cpp -Wall -Wextra -pedantic -ansi -lSDL -O3 && ./a.out
-g++ lodepng.cpp lodepng_benchmark.cpp -Wall -Wextra -pedantic -ansi -lSDL -O3 && ./a.out corpus/''*
+g++ lodepng.cpp lodepng_benchmark.cpp -Wall -Wextra -pedantic -ansi -lSDL -O3 && ./a.out testdata/corpus/''*
 
 *) Check if all examples compile without warnings:
 g++ -I ./ lodepng.cpp examples/''*.cpp -W -Wall -ansi -pedantic -O3 -c
@@ -82,7 +82,7 @@ g++ -DDISABLE_SLOW lodepng.cpp lodepng_util.cpp lodepng_unittest.cpp -Wall -Wext
 clang++ -fsanitize=address lodepng.cpp lodepng_util.cpp lodepng_unittest.cpp -Wall -Wextra -Wshadow -pedantic -ansi -O3 && ASAN_OPTIONS=allocator_may_return_null=1 ./a.out
 clang++ -fsanitize=address lodepng.cpp lodepng_util.cpp lodepng_unittest.cpp -Wall -Wextra -Wshadow -pedantic -ansi -g3 && ASAN_OPTIONS=allocator_may_return_null=1 ./a.out
 
-*) remove "#include <iostream>" from lodepng.cpp if it's still in there
+*) remove "#include <iostream>" from lodepng.cpp if it's still in there (some are legit)
 cat lodepng.cpp lodepng_util.cpp | grep iostream
 cat lodepng.cpp lodepng_util.cpp | grep stdio
 cat lodepng.cpp lodepng_util.cpp | grep "#include"
@@ -2502,15 +2502,18 @@ void testXYZ() {
 
   // Test sRGB -> XYZ -> sRGB roundtrip
 
+  unsigned rendering_intent = 3; // test with absolute for now
+
   // 8-bit
   {
     // Default state, the conversions use 8-bit sRGB
     lodepng::State state;
     std::vector<float> f(w * h * 4);
-    assertNoError(lodepng::convertToXYZ(f.data(), v.data(), w, h, &state));
+    float whitepoint[3];
+    assertNoError(lodepng::convertToXYZ(f.data(), whitepoint, v.data(), w, h, &state));
 
     std::vector<unsigned char> v2(w * h * 4);
-    assertNoError(lodepng::convertFromXYZ(v2.data(), f.data(), w, h, &state));
+    assertNoError(lodepng::convertFromXYZ(v2.data(), f.data(), w, h, whitepoint, rendering_intent, &state));
 
     for(size_t i = 0; i < v2.size(); i++) {
       ASSERT_EQUALS(v[i], v2[i]);
@@ -2523,10 +2526,11 @@ void testXYZ() {
     lodepng::State state;
     state.info_raw.bitdepth = 16;
     std::vector<float> f(w * h * 4);
-    assertNoError(lodepng::convertToXYZ(f.data(), v.data(), w, h, &state));
+    float whitepoint[3];
+    assertNoError(lodepng::convertToXYZ(f.data(), whitepoint, v.data(), w, h, &state));
 
     std::vector<unsigned char> v2(w * h * 8);
-    assertNoError(lodepng::convertFromXYZ(v2.data(), f.data(), w, h, &state));
+    assertNoError(lodepng::convertFromXYZ(v2.data(), f.data(), w, h, whitepoint, rendering_intent, &state));
 
     for(size_t i = 0; i < v2.size(); i++) {
       ASSERT_EQUALS(v[i], v2[i]);
@@ -2554,10 +2558,11 @@ void testXYZ() {
     lodepng::State state;
     lodepng_info_copy(&state.info_png, &info_custom);
     std::vector<float> f(w * h * 4);
-    assertNoError(lodepng::convertToXYZ(f.data(), v.data(), w, h, &state));
+    float whitepoint[3];
+    assertNoError(lodepng::convertToXYZ(f.data(), whitepoint, v.data(), w, h, &state));
 
     std::vector<unsigned char> v2(w * h * 4);
-    assertNoError(lodepng::convertFromXYZ(v2.data(), f.data(), w, h, &state));
+    assertNoError(lodepng::convertFromXYZ(v2.data(), f.data(), w, h, whitepoint, rendering_intent, &state));
 
     for(size_t i = 0; i < v2.size(); i++) {
       // Allow near instead of exact due to numerical issues with low values,
@@ -2576,10 +2581,11 @@ void testXYZ() {
     lodepng_info_copy(&state.info_png, &info_custom);
     state.info_raw.bitdepth = 16;
     std::vector<float> f(w * h * 4);
-    assertNoError(lodepng::convertToXYZ(f.data(), v.data(), w, h, &state));
+    float whitepoint[3];
+    assertNoError(lodepng::convertToXYZ(f.data(), whitepoint, v.data(), w, h, &state));
 
     std::vector<unsigned char> v2(w * h * 8);
-    assertNoError(lodepng::convertFromXYZ(v2.data(), f.data(), w, h, &state));
+    assertNoError(lodepng::convertFromXYZ(v2.data(), f.data(), w, h, whitepoint, rendering_intent, &state));
 
     for(size_t i = 0; i < v2.size(); i += 2) {
       unsigned a = v[i + 0] * 256u + v[i + 1];