Split off lodepng functionality in a separate library

doxygen · Jun 22, 2019 · 2af0885 · 2af0885
1 parent 5a3c3cb
commit 2af0885
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 31 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -143,6 +143,7 @@ endif()
 
 
 add_subdirectory(libmd5)
+add_subdirectory(liblodepng)
 add_subdirectory(qtools)
 add_subdirectory(vhdlparser)
 add_subdirectory(src)

diff --git a/addon/doxyapp/CMakeLists.txt b/addon/doxyapp/CMakeLists.txt
@@ -20,6 +20,7 @@ target_link_libraries(doxyapp
 _doxygen
 qtools
 md5
+lodepng
 doxycfg
 vhdlparser
 ${ICONV_LIBRARIES}

diff --git a/addon/doxyparse/CMakeLists.txt b/addon/doxyparse/CMakeLists.txt
@@ -20,6 +20,7 @@ target_link_libraries(doxyparse
 _doxygen
 qtools
 md5
+lodepng
 doxycfg
 vhdlparser
 ${ICONV_LIBRARIES}

diff --git a/liblodepng/CMakeLists.txt b/liblodepng/CMakeLists.txt
@@ -0,0 +1,3 @@
+add_library(lodepng STATIC
+lodepng.cpp
+)
diff --git a/src/lodepng.cpp → liblodepng/lodepng.cpp b/src/lodepng.cpp → liblodepng/lodepng.cpp
@@ -29,7 +29,6 @@ You are free to name this file lodepng.cpp or lodepng.c depending on your usage.
 */
 
 #include "lodepng.h"
-#include "portable.h"
 
 #define USE_BRUTE_FORCE_ENCODING 1
 
@@ -2436,7 +2435,11 @@ void LodePNG_Encoder_copy(LodePNG_Encoder* dest, const LodePNG_Encoder* source)
 unsigned LodePNG_saveFile(const unsigned char* buffer, size_t buffersize, const char* filename)
 {
   FILE* file;
-  file = portable_fopen(filename, "wb" );
+#if defined(_WIN32) && !defined(__CYGWIN__)
+  file = _fopen(filename,"wb");
+#else
+  file = fopen(filename,"wb");
+#endif
   if(!file) return 79;
   fwrite((char*)buffer , 1 , buffersize, file);
   fclose(file);

diff --git a/src/lodepng.h → liblodepng/lodepng.h b/src/lodepng.h → liblodepng/lodepng.h
@@ -32,6 +32,10 @@ freely, subject to the following restrictions:
 #include <stdlib.h>
 #include <string.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* ////////////////////////////////////////////////////////////////////////// */
 /* LodeFlate & LodeZlib Setting structs                                       */
 /* ////////////////////////////////////////////////////////////////////////// */
@@ -115,5 +119,9 @@ void LodePNG_encode(LodePNG_Encoder* encoder, unsigned char** out, size_t* outsi
 //unsigned LodePNG_loadFile(unsigned char** out, size_t* outsize, const char* filename);
 unsigned LodePNG_saveFile(const unsigned char* buffer, size_t buffersize, const char* filename);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
 
diff --git a/libmd5/Makefile.in b/libmd5/Makefile.in
diff --git a/libmd5/libmd5.pro.in b/libmd5/libmd5.pro.in
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -3,6 +3,7 @@
 include_directories(
     ${CMAKE_SOURCE_DIR}/qtools
     ${CMAKE_SOURCE_DIR}/libmd5
+    ${CMAKE_SOURCE_DIR}/liblodepng
     ${CMAKE_SOURCE_DIR}/vhdlparser/
     ${CMAKE_SOURCE_DIR}/src
     ${CLANG_INCLUDEDIR}
@@ -217,7 +218,6 @@ add_library(_doxygen STATIC
     latexdocvisitor.cpp
     latexgen.cpp
     layout.cpp
-    lodepng.cpp
     mandocvisitor.cpp
     mangen.cpp
     sqlite3gen.cpp
@@ -282,6 +282,7 @@ target_link_libraries(doxygen
     doxycfg
     qtools
     md5
+    lodepng
     vhdlparser
     ${SQLITE3_LIBRARIES}
     ${ICONV_LIBRARIES}