Update wvWare wrapper

CMakeLists.txt

@@ -211,8 +211,7 @@ if(WITH_PDF2HTMLEX)
 endif(WITH_PDF2HTMLEX)
 if(WITH_WVWARE)
     find_package(wvware REQUIRED)
-    # target "meta" errors out if wvware is linked privately
-    target_link_libraries(odr PUBLIC wvware::wvware)
+    target_link_libraries(odr PRIVATE wvware::wvware)
 endif(WITH_WVWARE)
 
 if (EXISTS "${PROJECT_SOURCE_DIR}/.git")

src/odr/internal/html/wvWare_wrapper.cpp

@@ -8,14 +8,13 @@
 
 extern "C" {
 int convert(char *inputFile, char *outputDir, const char *password);
-int no_graphics = 1;
-int documentId = 0;
-
-char *s_WVDATADIR = NULL;
-char *s_HTMLCONFIG = NULL;
+extern int no_graphics;
+extern int documentId;
+extern char *s_WVDATADIR;
+extern char *s_HTMLCONFIG;
 }
 
-namespace odr::internal {
+namespace odr::internal::html {
 
 Html wvWare_wrapper(const File &file, const std::string &output_path,
                     const HtmlConfig &config) {
@@ -61,4 +60,4 @@ Html wvWare_wrapper(const File &file, const std::string &output_path,
       FileType::legacy_word_document, config, {{"document", output_file_path}}};
 }
 
-} // namespace odr::internal
+} // namespace odr::internal::html

src/wvWare.c

@@ -48,9 +48,10 @@
 #define wvTrace( args )
 #endif
 
-extern char *s_WVDATADIR;
-extern char *s_HTMLCONFIG;
-extern int documentId;
+char *s_WVDATADIR = NULL;
+char *s_HTMLCONFIG = NULL;
+int documentId = 0;
+
 #define static_reinit( variable, defaultValue ) { \
   static int staticVarValue = 0; \
   if (staticVarValue != documentId) { \