From 12dd896bf3290f31f9686edde09fc88aef2b0178 Mon Sep 17 00:00:00 2001
From: Martin Ridgers <martin.ridgers@epicgames.com>
Date: Wed, 8 Sep 2021 16:20:16 +0200
Subject: Added #ifdef around Windows-only #pragma-comment-lib statements

---
 zencore/compress.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'zencore/compress.cpp')

diff --git a/zencore/compress.cpp b/zencore/compress.cpp
index 2b2c4dd0b..2435c754c 100644
--- a/zencore/compress.cpp
+++ b/zencore/compress.cpp
@@ -8,7 +8,9 @@
 #include <zencore/endian.h>
 
 #include "../3rdparty/Oodle/include/oodle2.h"
-#pragma comment(lib, "oo2core_win64.lib")
+#if ZEN_PLATFORM_WINDOWS
+#	pragma comment(lib, "oo2core_win64.lib")
+#endif
 
 #include <doctest/doctest.h>
 #include <lz4.h>
-- 
cgit v1.2.3


From 4c1200880354bc18b2ad1045f1c781ba0e92c86c Mon Sep 17 00:00:00 2001
From: Martin Ridgers <martin.ridgers@epicgames.com>
Date: Wed, 8 Sep 2021 16:24:49 +0200
Subject: Missing #include

---
 zencore/compress.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'zencore/compress.cpp')

diff --git a/zencore/compress.cpp b/zencore/compress.cpp
index 2435c754c..55808375e 100644
--- a/zencore/compress.cpp
+++ b/zencore/compress.cpp
@@ -15,6 +15,7 @@
 #include <doctest/doctest.h>
 #include <lz4.h>
 #include <functional>
+#include <limits>
 
 namespace zen::detail {
 
-- 
cgit v1.2.3


From f3417e09ac636f2aa487e557e8ed2b661d430120 Mon Sep 17 00:00:00 2001
From: Stefan Boberg <stefan@boberg.org>
Date: Wed, 15 Sep 2021 14:55:25 +0200
Subject: Unsigned / signed comparison warning fixes

---
 zencore/compress.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'zencore/compress.cpp')

diff --git a/zencore/compress.cpp b/zencore/compress.cpp
index 55808375e..12a7b9ef8 100644
--- a/zencore/compress.cpp
+++ b/zencore/compress.cpp
@@ -103,7 +103,7 @@ struct BufferHeader
 		constexpr uint64_t MethodOffset = offsetof(BufferHeader, Method);
 		for (MemoryView View = HeaderView + MethodOffset; const uint64_t ViewSize = View.GetSize();)
 		{
-			const int32_t Size = static_cast<int32_t>(zen::Min<uint64_t>(ViewSize, INT_MAX));
+			const int32_t Size = static_cast<int32_t>(zen::Min<uint64_t>(ViewSize, /* INT_MAX */ 2147483647u));
 			Crc32			   = zen::MemCrc32(View.GetData(), Size, Crc32);
 			View += Size;
 		}
@@ -211,7 +211,7 @@ private:
 CompositeBuffer
 BlockEncoder::Compress(const CompositeBuffer& RawData, const uint64_t BlockSize) const
 {
-	ZEN_ASSERT(IsPow2(BlockSize) && BlockSize <= (1 << 31));
+	ZEN_ASSERT(IsPow2(BlockSize) && (BlockSize <= (1u << 31)));
 
 	const uint64_t RawSize = RawData.GetSize();
 	BLAKE3Stream   RawHash;
@@ -592,7 +592,7 @@ protected:
 			const int Size = LZ4_decompress_safe(static_cast<const char*>(CompressedData.GetData()),
 												 static_cast<char*>(RawData.GetData()),
 												 static_cast<int>(CompressedData.GetSize()),
-												 static_cast<int>(zen::Min<uint64_t>(RawData.GetSize(), LZ4_MAX_INPUT_SIZE)));
+												 static_cast<int>(zen::Min<uint64_t>(RawData.GetSize(), uint64_t(LZ4_MAX_INPUT_SIZE))));
 			return static_cast<uint64_t>(Size) == RawData.GetSize();
 		}
 		return false;
-- 
cgit v1.2.3