updated zlib 1.2.12.1 dev and fixed bug with first value in CUBE file

michelerenzullo · Jun 18, 2022 · b9ca7c9 · b9ca7c9
1 parent 2d83c10
commit b9ca7c9
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/XMPConverter/XMPconverter.cpp b/XMPConverter/XMPconverter.cpp
@@ -194,7 +194,7 @@ void encode(string path, string& outFileName) {
 		for (const char* s = text.c_str(); *s;) if (*s++ == '\n' && *s <= '9' && *s >= '0') { points = points_address = _strdup(s); break; }
 		if (points) {
 			double* samples_1 = new double[(size_t)input_size * input_size * input_size * 3];
-			for (int32 idx = 0; idx < input_size * input_size * input_size * 3;) if (points++) samples_1[idx++] = strtod(points, &points);
+			for (int32 idx = 0; idx < input_size * input_size * input_size * 3;) samples_1[idx++] = strtod(points++, &points);
 			free(points_address);
 
 			uint32 size = (input_size > options.size) ? options.size : input_size;

diff --git a/XMPConverter/zlib.h b/XMPConverter/zlib.h
@@ -1,5 +1,5 @@
 /* zlib.h -- interface of the 'zlib' general purpose compression library
-  version 1.2.12, March 11th, 2022
+  version 1.2.12.1, March xxth, 2022
 
   Copyright (C) 1995-2022 Jean-loup Gailly and Mark Adler
 
@@ -37,12 +37,12 @@
 extern "C" {
 #endif
 
-#define ZLIB_VERSION "1.2.12"
-#define ZLIB_VERNUM 0x12c0
+#define ZLIB_VERSION "1.2.12.1-motley"
+#define ZLIB_VERNUM 0x12c1
 #define ZLIB_VER_MAJOR 1
 #define ZLIB_VER_MINOR 2
 #define ZLIB_VER_REVISION 12
-#define ZLIB_VER_SUBREVISION 0
+#define ZLIB_VER_SUBREVISION 1
 
 /*
     The 'zlib' compression library provides in-memory compression and

diff --git a/XMPConverter/zlibstatic.lib b/XMPConverter/zlibstatic.lib