Allow simultaneous support of different archive libraries

Signed-off-by: Stefan Weil <[email protected]>

Author: stweil

src/api/Makefile.am

@@ -76,19 +76,16 @@ tesseract_LDADD += $(LEPTONICA_LIBS)
 tesseract_LDADD += $(OPENMP_CXXFLAGS)
 if HAVE_LIBARCHIVE
 tesseract_LDADD += $(libarchive_LIBS)
-else
+endif
 if HAVE_LIBZIP
 tesseract_LDADD += $(libzip_LIBS)
-else
+endif
 if HAVE_MINIZIP
 tesseract_LDADD += $(minizip_LIBS)
-else
+endif
 if HAVE_ZZIPLIB
 tesseract_LDADD += $(zziplib_LIBS)
 endif
-endif
-endif
-endif
 
 if T_WIN
 tesseract_LDADD += -ltiff

src/ccutil/Makefile.am

@@ -40,19 +40,16 @@ libtesseract_ccutil_la_SOURCES = \
 
 if HAVE_LIBARCHIVE
 AM_CPPFLAGS += $(libarchive_CFLAGS)
-else
+endif
 if HAVE_LIBZIP
 AM_CPPFLAGS += $(libzip_CFLAGS)
-else
+endif
 if HAVE_MINIZIP
 AM_CPPFLAGS += $(minizip_CFLAGS)
-else
+endif
 if HAVE_ZZIPLIB
 AM_CPPFLAGS += $(zziplib_CFLAGS)
 endif
-endif
-endif
-endif
 
 if T_WIN
 AM_CPPFLAGS += -DWINDLLNAME=\"lib@GENERIC_LIBRARY_NAME@\"

src/ccutil/tessdatamanager.cpp

@@ -29,13 +29,21 @@
 #if defined(HAVE_LIBARCHIVE)
 #include <archive.h>
 #include <archive_entry.h>
-#elif defined(HAVE_LIBZIP)
+#endif
+#if defined(HAVE_LIBZIP)
+#if defined(HAVE_MINIZIP)
+// libminizip provides minizip/zip.h. Hack to get the right one.
+#include "/usr/include/zip.h"
+#else
 #include <zip.h>
-#elif defined(HAVE_MINIZIP)
+#endif
+#endif
+#if defined(HAVE_MINIZIP)
 #include <unzip.h>
-#elif defined(HAVE_ZZIPLIB)
+#endif
+#if defined(HAVE_ZZIPLIB)
 #include <zzip/lib.h>
-#endif // ZIP supported
+#endif
 
 #include "errcode.h"
 #include "helpers.h"
@@ -65,7 +73,7 @@ void TessdataManager::LoadFileLater(const char *data_file_name) {
 }
 
 #if defined(HAVE_LIBARCHIVE)
-bool TessdataManager::LoadZipFile(const char *filename) {
+bool TessdataManager::LoadArchiveFile(const char *filename) {
   bool result = false;
 #ifndef NDEBUG
   tprintf("TessdataManager::%s(%s)\n", __func__, filename);
@@ -116,7 +124,9 @@ bool TessdataManager::LoadZipFile(const char *filename) {
   }
   return result;
 }
-#elif defined(HAVE_LIBZIP)
+#endif
+
+#if defined(HAVE_LIBZIP)
 bool TessdataManager::LoadZipFile(const char *filename) {
   bool result = false;
 #ifndef NDEBUG
@@ -180,8 +190,10 @@ bool TessdataManager::LoadZipFile(const char *filename) {
   }
   return result;
 }
-#elif defined(HAVE_MINIZIP)
-bool TessdataManager::LoadZipFile(const char *filename) {
+#endif
+
+#if defined(HAVE_MINIZIP)
+bool TessdataManager::LoadMinizipFile(const char *filename) {
   bool result = false;
 #ifndef NDEBUG
   tprintf("TessdataManager::%s(%s)\n", __func__, filename);
@@ -275,8 +287,10 @@ bool TessdataManager::LoadZipFile(const char *filename) {
   }
   return result;
 }
-#elif defined(HAVE_ZZIPLIB)
-bool TessdataManager::LoadZipFile(const char *filename) {
+#endif
+
+#if defined(HAVE_ZZIPLIB)
+bool TessdataManager::LoadZzipFile(const char *filename) {
   bool result = false;
 #ifndef NDEBUG
   tprintf("TessdataManager::%s(%s)\n", __func__, filename);
@@ -311,19 +325,31 @@ bool TessdataManager::LoadZipFile(const char *filename) {
   }
   return result;
 }
-#else
-#define HAVE_NOZIP
-#endif // ZIP supported
+#endif
 
 bool TessdataManager::Init(const char *data_file_name) {
 #ifndef NDEBUG
   tprintf("TessdataManager::%s(%s)\n", __func__, data_file_name);
 #endif
   GenericVector<char> data;
   if (reader_ == nullptr) {
-#if !defined(HAVE_NOZIP)
+    const char *tessarchive = getenv("TESSARCHIVE");
+#if defined(HAVE_LIBARCHIVE)
+    if (tessarchive == nullptr || strcmp(tessarchive, "libarchive") == 0)
+    if (LoadArchiveFile(data_file_name)) return true;
+#endif
+#if defined(HAVE_MINIZIP)
+    if (tessarchive == nullptr || strcmp(tessarchive, "libminizip") == 0)
     if (LoadZipFile(data_file_name)) return true;
 #endif // HAVE_MINIZIP
+#if defined(HAVE_LIBZIP)
+    if (tessarchive == nullptr || strcmp(tessarchive, "libzip") == 0)
+    if (LoadZipFile(data_file_name)) return true;
+#endif // HAVE_MINIZIP
+#if defined(HAVE_ZZIPLIB)
+    if (tessarchive == nullptr || strcmp(tessarchive, "libzzip") == 0)
+    if (LoadZzipFile(data_file_name)) return true;
+#endif
     if (!LoadDataFromFile(data_file_name, &data)) return false;
   } else {
     if (!(*reader_)(data_file_name, &data)) return false;

src/ccutil/tessdatamanager.h

@@ -219,7 +219,14 @@ class TessdataManager {
 
  private:
 
+  // Use libarchive.
+  bool LoadArchiveFile(const char *filename);
+  // Use libminizip.
+  bool LoadMinizipFile(const char *filename);
+  // Use libzip.
   bool LoadZipFile(const char *filename);
+  // Use libzzip.
+  bool LoadZzipFile(const char *filename);
 
   /**
    * Fills type with TessdataType of the tessdata component represented by the

src/training/Makefile.am

@@ -278,22 +278,18 @@ text2image_LDADD += $(LEPTONICA_LIBS)
 unicharset_extractor_LDADD += $(LEPTONICA_LIBS)
 wordlist2dawg_LDADD += $(LEPTONICA_LIBS)
 
-if HAVE_LIBARCHIVE
-extralib = $(libarchive_LIBS)
-else
-if HAVE_LIBZIP
-extralib = $(libzip_LIBS)
-else
-if HAVE_MINIZIP
-extralib = $(minizip_LIBS)
-else
-if HAVE_ZZIPLIB
-extralib = $(zziplib_LIBS)
-else
 extralib =
+if HAVE_LIBARCHIVE
+extralib += $(libarchive_LIBS)
 endif
+if HAVE_LIBZIP
+extralib += $(libzip_LIBS)
 endif
+if HAVE_MINIZIP
+extralib += $(minizip_LIBS)
 endif
+if HAVE_ZZIPLIB
+extralib += $(zziplib_LIBS)
 endif
 
 ambiguous_words_LDADD += $(extralib)