fix XP build?

sylikc · Nov 25, 2023 · 04e62ea · 04e62ea
1 parent 90106df
commit 04e62ea
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/src/JPEGView/ImageLoadThread.cpp b/src/JPEGView/ImageLoadThread.cpp
@@ -11,8 +11,8 @@
 #include "BasicProcessing.h"
 #include "dcraw_mod.h"
 #include "TJPEGWrapper.h"
-#ifndef WINXP
 #include "PNGWrapper.h"
+#ifndef WINXP
 #include "JXLWrapper.h"
 #include "HEIFWrapper.h"
 #include "AVIFWrapper.h"

diff --git a/src/JPEGView/PNGWrapper.cpp b/src/JPEGView/PNGWrapper.cpp
@@ -1,10 +1,11 @@
 #include "stdafx.h"
 
 #include "PNGWrapper.h"
+
+#ifndef WINXP
 #include "png.h"
 #include "MaxImageDef.h"
 #include <stdexcept>
-#include <stdlib.h>
 
 // Uncomment to build without APNG support
 //#undef PNG_APNG_SUPPORTED
@@ -400,6 +401,9 @@ bool PngReader::IsAnimated(void* buffer, size_t sizebytes) {
 	}
 	return false;
 }
+#else
+#define PNG_UINT_31_MAX (0x7fffffff)
+#endif
 
 void* PngReader::GetEXIFBlock(void* buffer, size_t sizebytes) {
 	size_t offset = 8; // skip PNG signature

diff --git a/src/JPEGView/PNGWrapper.h b/src/JPEGView/PNGWrapper.h
@@ -4,6 +4,7 @@
 class PngReader
 {
 public:
+#ifndef WINXP
 	// Returns data in 4 byte BGRA
 	static void* ReadImage(int& width,   // width of the image loaded.
 		int& height,  // height of the image loaded.
@@ -20,14 +21,16 @@ class PngReader
 
 	// Returns true if PNG is animated, false otherwise
 	static bool IsAnimated(void* buffer, size_t sizebytes);
-
+#endif
 	// Get EXIF Block
 	static void* GetEXIFBlock(void* buffer, size_t sizebytes);
 
+#ifndef WINXP
 private:
 	struct png_cache;
 	static png_cache cache;
 	static bool BeginReading(void* buffer, size_t sizebytes, bool& outOfMemory);
 	static void* ReadNextFrame(void** exif_chunk, unsigned int* exif_size);
 	static void DeleteCacheInternal(bool free_buffer);
+#endif
 };