make Font creation works on Ubuntu 18.04

DocCreator · Jan 21, 2020 · 2a5059d · 2a5059d
1 parent 06ac1f2
commit 2a5059d
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/cmake/Modules/FindTesseract.cmake b/cmake/Modules/FindTesseract.cmake
@@ -39,13 +39,14 @@ find_path(Tesseract_TESSDATA_PARENT_DIR
   PATHS ${Tesseract_PKGCONF_DATAROOTDIR}
   /usr/share/tesseract
   /usr/share/tesseract-ocr
+  /usr/share/tesseract-ocr/4.00
   )
 
 INCLUDE(FindPackageHandleStandardArgs)
 
-# handle the QUIETLY and REQUIRED arguments and set GIRL_FOUND to TRUE if 
+# handle the QUIETLY and REQUIRED arguments and set Tesseract_FOUND to TRUE if
 # all listed variables are TRUE
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(Tesseract DEFAULT_MSG Tesseract_LIBRARY Tesseract_INCLUDE_DIR Lept_FOUND)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Tesseract DEFAULT_MSG Tesseract_LIBRARY Tesseract_INCLUDE_DIR Lept_FOUND Tesseract_TESSDATA_PARENT_DIR)
 
 IF(TESSERACT_FOUND)
   SET(Tesseract_FOUND TRUE)

diff --git a/software/DocCreator/src/FontGenerator/OCRDialog.cpp b/software/DocCreator/src/FontGenerator/OCRDialog.cpp
@@ -215,6 +215,12 @@ OCRDialog::process()
   tess.SetVariable("tessedit_char_whitelist",
                    "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz");
 
+#if TESSERACT_VERSION == 262144
+  //On Ubuntu 18.04, it seems that tesseract 4.0 needs "tessdata" in path to find languages
+  // and thus to initialize correctly.
+  m_tessdataParentDir += "tessdata";
+#endif
+
   const QByteArray tessdataParentDirBA = m_tessdataParentDir.toLatin1();
   const char *tessdataParentDir = tessdataParentDirBA.constData();
   //B:Warning: tessdataParentDir must end with "/"
@@ -250,6 +256,7 @@ OCRDialog::process()
 #endif //TESSERACT_VERSION
 
   const int tessInitFailed =
+    //tess.Init("/usr/share/tesseract-ocr/4.00/tessdata/", language, tesseract::OEM_DEFAULT);
     tess.Init(tessdataParentDir, language, tesseract::OEM_DEFAULT);
 
   if (tessInitFailed == 0) {
@@ -353,6 +360,11 @@ OCRDialog::process()
 
     updateView();
   }
+  else {
+
+    std::cerr<<"ERROR: tesseract initialization failed\n";
+    std::cerr <<" TESSERACT_VERSION="<<TESSERACT_VERSION<<"\n";
+  }
 }
 
 void