Merge pull request #134 from gditeck/decouple-lzo

Decouple and update lzo.
OpenXRay · Apr 6, 2016 · c8f87ab · c8f87ab
2 parents 63faeba + 49d16a9
commit c8f87ab
Show file tree

Hide file tree

Showing 32 changed files with 72 additions and 12,470 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -16,3 +16,6 @@
 [submodule "src/Externals/glew"]
 	path = src/Externals/glew
 	url = https://github.com/Armada651/glew.git
+[submodule "src/Externals/lzo"]
+	path = src/Externals/lzo
+	url = https://github.com/alexgdi/lzo.git
diff --git a/src/Externals/lzo b/src/Externals/lzo
diff --git a/src/xrCore/Compression/lzo_compressor.cpp b/src/xrCore/Compression/lzo_compressor.cpp
@@ -0,0 +1,23 @@
+#include "stdafx.h"
+#include "lzo_compressor.h"
+#include "lzo/lzo1x.h"
+
+int lzo_compress_dict(const void *input, u32 inputSize, void *output, u32 &outputSize,
+    void *workMem, const void *dict, u32 dictSize)
+{
+    return lzo1x_999_compress_dict((lzo_bytep)input, inputSize, (lzo_bytep)output, (lzo_uintp)&outputSize,
+        workMem, (lzo_bytep)dict, dictSize);
+}
+
+int lzo_decompress_dict(const void *input, u32 inputSize, void *output, u32 &outputSize,
+    void *workMem, const void *dict, u32 dictSize)
+{
+    return lzo1x_decompress_dict_safe((lzo_bytep)input, inputSize, (lzo_bytep)output, (lzo_uintp)&outputSize,
+        workMem, (lzo_bytep)dict, dictSize);
+}
+
+int lzo_initialize()
+{ return lzo_init(); }
+
+u32 lzo_get_workmem_size()
+{ return LZO1X_999_MEM_COMPRESS; }
diff --git a/src/xrCore/Compression/lzo_compressor.h b/src/xrCore/Compression/lzo_compressor.h
@@ -0,0 +1,12 @@
+#pragma once
+#include "xrCore/xrCore.h"
+
+XRCORE_API int lzo_compress_dict(const void *input, u32 inputSize, void *output, u32 &outputSize,
+    void *workMem, const void *dict, u32 dictSize);
+
+XRCORE_API int lzo_decompress_dict(const void *input, u32 inputSize, void *output, u32 &outputSize,
+    void *workMem, const void *dict, u32 dict_len);
+
+XRCORE_API int lzo_initialize();
+
+XRCORE_API u32 lzo_get_workmem_size();
diff --git a/src/xrCore/rt_compressor.cpp → src/xrCore/Compression/rt_compressor.cpp b/src/xrCore/rt_compressor.cpp → src/xrCore/Compression/rt_compressor.cpp
@@ -3,7 +3,7 @@
 
 
 
-#include "rt_lzo1x.h"
+#include "lzo/lzo1x.h"
 
 
 #define HEAP_ALLOC(var,size) \

diff --git a/src/xrCore/rt_compressor.h → src/xrCore/Compression/rt_compressor.h b/src/xrCore/rt_compressor.h → src/xrCore/Compression/rt_compressor.h
diff --git a/src/xrCore/rt_compressor9.cpp → src/xrCore/Compression/rt_compressor9.cpp b/src/xrCore/rt_compressor9.cpp → src/xrCore/Compression/rt_compressor9.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #pragma hdrstop
 
-#include "rt_lzo1x.h"
+#include "lzo/lzo1x.h"
 
 
 //==============================================================================

diff --git a/src/xrCore/rt_config1x.h b/src/xrCore/rt_config1x.h
diff --git a/src/xrCore/rt_lzo1_d.ch b/src/xrCore/rt_lzo1_d.ch
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3,7 +3,7 @@



		#include "rt_lzo1x.h"
		#include "lzo/lzo1x.h"


		#define HEAP_ALLOC(var,size) \
Expand Down