From 7682175182385ad5899447ab2d4239b3848864fb Mon Sep 17 00:00:00 2001
From: Caleb Deveraux <416931+carrus85@users.noreply.github.com>
Date: Wed, 31 Jul 2024 16:41:14 -0600
Subject: [PATCH 1/3] fix: use snprintf instead of sprintf (removes warnings)

---
 cplusplus/UnconvertFromZDW.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/cplusplus/UnconvertFromZDW.cpp b/cplusplus/UnconvertFromZDW.cpp
index 1280f79..d867182 100644
--- a/cplusplus/UnconvertFromZDW.cpp
+++ b/cplusplus/UnconvertFromZDW.cpp
@@ -635,9 +635,10 @@ string UnconvertFromZDW_Base::getColumnDesc(const string& name, UCHAR type, size
 		case VIRTUAL_EXPORT_FILE_BASENAME:
 		case VARCHAR:
 		{
-			char temp[32];
+			const size_t TEMP_BUFFER_SIZE=32;
+			char temp[TEMP_BUFFER_SIZE];
 			const int char_size = (this->columnCharSize && this->columnCharSize[index]) ? this->columnCharSize[index] : 255; //before version 7, we don't have a size value
-			sprintf(temp, "varchar(%d)", char_size);
+			snprintf(temp, TEMP_BUFFER_SIZE, "varchar(%d)", char_size);
 			text += temp;
 		}
 		break;
@@ -1269,12 +1270,13 @@ void UnconvertFromZDW<T>::outputDefault(T& buffer, const UCHAR type)
 template <typename T>
 ERR_CODE UnconvertFromZDW<T>::readNextRow(T& buffer)
 {
+	const size_t TEMP_BUFFER_SIZE=64;
 	long u = 0;
 	char *pos;
 	ULONG index;
 	ULONGLONG visid_low = 0;
 	int tempLength;
-	char temp[64];
+	char temp[TEMP_BUFFER_SIZE];
 	bool bColumnWritten = false;
 
 	IncrementCurrentRowNumber();
@@ -1443,7 +1445,7 @@ ERR_CODE UnconvertFromZDW<T>::readNextRow(T& buffer)
 							pos = GetWord(index, row);
 							buffer.write(pos, strlen(pos));
 						} else { //version 1-3
-							tempLength = sprintf(temp, "%0.12lf", (val.n + this->columnBase[c]) / this->decimalFactor);
+							tempLength = snprintf(temp, TEMP_BUFFER_SIZE, "%0.12lf", (val.n + this->columnBase[c]) / this->decimalFactor);
 							buffer.write(temp, tempLength);
 						}
 					} else {

From 36f0ab56605566451a2cbf823f6ea1b125d1c420 Mon Sep 17 00:00:00 2001
From: Caleb Deveraux <416931+carrus85@users.noreply.github.com>
Date: Wed, 7 Aug 2024 15:47:44 -0600
Subject: [PATCH 2/3] fix: Add missing cassert include

Not including this will cause an error if boost isn't included.
---
 cplusplus/UnconvertFromZDW.cpp | 1 +
 cplusplus/unconvertDWfile.cpp  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/cplusplus/UnconvertFromZDW.cpp b/cplusplus/UnconvertFromZDW.cpp
index d867182..dc65e77 100644
--- a/cplusplus/UnconvertFromZDW.cpp
+++ b/cplusplus/UnconvertFromZDW.cpp
@@ -20,6 +20,7 @@
 #include <math.h>
 #include <ostream>
 #include <set>
+#include <cassert>
 #include <sstream>
 #include <stdint.h>
 #include <string.h>
diff --git a/cplusplus/unconvertDWfile.cpp b/cplusplus/unconvertDWfile.cpp
index e3b415a..4e8a28a 100644
--- a/cplusplus/unconvertDWfile.cpp
+++ b/cplusplus/unconvertDWfile.cpp
@@ -17,6 +17,7 @@
 #include "zdw/UnconvertFromZDW.h"
 
 #include <algorithm>
+#include <cassert>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

From 4e41a290a4e11d807a8d8cb336dac0cc5f41473e Mon Sep 17 00:00:00 2001
From: Caleb Deveraux <416931+carrus85@users.noreply.github.com>
Date: Wed, 7 Aug 2024 15:47:23 -0600
Subject: [PATCH 3/3] feat(c++11): Require C++11 minimum

---
 cplusplus/CMakeLists.txt         | 3 +++
 cplusplus/README.md              | 4 ++++
 cplusplus/zdw/UnconvertFromZDW.h | 5 ++---
 3 files changed, 9 insertions(+), 3 deletions(-)
 create mode 100644 cplusplus/README.md

diff --git a/cplusplus/CMakeLists.txt b/cplusplus/CMakeLists.txt
index 166a8ca..540bb62 100644
--- a/cplusplus/CMakeLists.txt
+++ b/cplusplus/CMakeLists.txt
@@ -46,3 +46,6 @@ target_link_libraries(zdw ${ZLIB_LIBRARIES})
 target_link_libraries(unconvertDWfile zdw)
 target_link_libraries(convertDWfile zdw)
 
+set_property(TARGET zdw PROPERTY CXX_STANDARD 11)
+set_property(TARGET unconvertDWfile PROPERTY CXX_STANDARD 11)
+set_property(TARGET convertDWfile PROPERTY CXX_STANDARD 11)
diff --git a/cplusplus/README.md b/cplusplus/README.md
new file mode 100644
index 0000000..4b5ed2a
--- /dev/null
+++ b/cplusplus/README.md
@@ -0,0 +1,4 @@
+# ZDW Compression Library
+
+Build Requirements:
+* C++11 compatible compiler.
diff --git a/cplusplus/zdw/UnconvertFromZDW.h b/cplusplus/zdw/UnconvertFromZDW.h
index 003ed7d..73a37d8 100644
--- a/cplusplus/zdw/UnconvertFromZDW.h
+++ b/cplusplus/zdw/UnconvertFromZDW.h
@@ -23,8 +23,7 @@
 #include <stdexcept>
 #include <string>
 #include <vector>
-
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 
 
 namespace adobe {
@@ -348,7 +347,7 @@ class UnconvertFromZDWToMemory : public UnconvertFromZDW<BufferedOutputInMem>
 	ERR_CODE handleZDWParseBlockHeader();
 
 private:
-	boost::scoped_ptr<BufferedOutputInMem> pBufferedOutput;
+	std::unique_ptr<BufferedOutputInMem> pBufferedOutput;
 	size_t num_output_columns;
 	bool bUseInternalBuffer;
 };