Simplify. Move related function from separate file.

src/ccstruct/ccstruct.cpp

@@ -28,9 +28,4 @@ const double CCStruct::kAscenderFraction = 0.25;
 const double CCStruct::kXHeightCapRatio =
     CCStruct::kXHeightFraction / (CCStruct::kXHeightFraction + CCStruct::kAscenderFraction);
 
-// Destructor.
-// It is defined here, so the compiler can create a single vtable
-// instead of weak vtables in every compilation unit.
-CCStruct::~CCStruct() = default;
-
 } // namespace tesseract

src/ccstruct/ccstruct.h

@@ -22,11 +22,9 @@
 #include "ccutil.h" // for CCUtil
 
 namespace tesseract {
-class TESS_API CCStruct : public CCUtil {
-public:
-  CCStruct() = default;
-  ~CCStruct() override;
 
+class CCStruct : public CCUtil {
+public:
   // Globally accessible constants.
   // APPROXIMATIONS of the fractions of the character cell taken by
   // the descenders, ascenders, and x-height.
@@ -36,6 +34,7 @@ public:
   // Derived value giving the x-height as a fraction of cap-height.
   static const double kXHeightCapRatio; // = XHeight/(XHeight + Ascender).
 };
+
 } // namespace tesseract
 
 #endif // TESSERACT_CCSTRUCT_CCSTRUCT_H_

src/ccutil/ccutil.cpp

@@ -10,13 +10,21 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#if defined(_WIN32)
+#  include <io.h> // for _access
+#endif
+
 #include "ccutil.h"
 
+#include <cstdlib>
+#include <cstring> // for std::strrchr
+
 namespace tesseract {
+
 CCUtil::CCUtil()
     : params_()
-    , INT_INIT_MEMBER(ambigs_debug_level, 0, "Debug level for unichar ambiguities", &params_)
-    , BOOL_MEMBER(use_ambigs_for_adaption, false,
+      , INT_INIT_MEMBER(ambigs_debug_level, 0, "Debug level for unichar ambiguities", &params_)
+      , BOOL_MEMBER(use_ambigs_for_adaption, false,
                   "Use ambigs for deciding"
                   " whether to adapt to a character",
                   &params_) {}
@@ -26,4 +34,58 @@ CCUtil::CCUtil()
 // instead of weak vtables in every compilation unit.
 CCUtil::~CCUtil() = default;
 
+/**
+ * @brief CCUtil::main_setup - set location of tessdata and name of image
+ *
+ * @param argv0 - paths to the directory with language files and config files.
+ * An actual value of argv0 is used if not nullptr, otherwise TESSDATA_PREFIX is
+ * used if not nullptr, next try to use compiled in -DTESSDATA_PREFIX. If
+ * previous is not successful - use current directory.
+ * @param basename - name of image
+ */
+void CCUtil::main_setup(const std::string &argv0, const std::string &basename) {
+  imagebasename = basename; /**< name of image */
+
+  char *tessdata_prefix = getenv("TESSDATA_PREFIX");
+
+  if (!argv0.empty()) {
+    /* Use tessdata prefix from the command line. */
+    datadir = argv0;
+  } else if (tessdata_prefix) {
+    /* Use tessdata prefix from the environment. */
+    datadir = tessdata_prefix;
+#if defined(_WIN32)
+  } else if (datadir.empty() || _access(datadir.c_str(), 0) != 0) {
+    /* Look for tessdata in directory of executable. */
+    char path[_MAX_PATH];
+    DWORD length = GetModuleFileName(nullptr, path, sizeof(path));
+    if (length > 0 && length < sizeof(path)) {
+      char *separator = std::strrchr(path, '\\');
+      if (separator != nullptr) {
+        *separator = '\0';
+        datadir = path;
+        datadir += "/tessdata";
+      }
+    }
+#endif /* _WIN32 */
+#if defined(TESSDATA_PREFIX)
+  } else {
+    // Use tessdata prefix which was compiled in.
+    datadir = TESSDATA_PREFIX "/tessdata";
+#endif
+  }
+
+  // datadir may still be empty:
+  if (datadir.empty()) {
+    datadir = "./";
+  }
+
+  // check for missing directory separator
+  const char *lastchar = datadir.c_str();
+  lastchar += datadir.length() - 1;
+  if ((strcmp(lastchar, "/") != 0) && (strcmp(lastchar, "\\") != 0)) {
+    datadir += "/";
+  }
+}
+
 } // namespace tesseract

src/ccutil/mainblk.cpp

@@ -1,82 +0,0 @@
-/**********************************************************************
- * File:        mainblk.cpp  (Formerly main.c)
- * Description: Function to call from main() to setup.
- * Author:      Ray Smith
- *
- * (C) Copyright 1991, Hewlett-Packard Ltd.
- ** Licensed under the Apache License, Version 2.0 (the "License");
- ** you may not use this file except in compliance with the License.
- ** You may obtain a copy of the License at
- ** http://www.apache.org/licenses/LICENSE-2.0
- ** Unless required by applicable law or agreed to in writing, software
- ** distributed under the License is distributed on an "AS IS" BASIS,
- ** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ** See the License for the specific language governing permissions and
- ** limitations under the License.
- *
- **********************************************************************/
-
-#include <cstdlib>
-#include <cstring> // for std::strrchr
-#if defined(_WIN32)
-#  include <io.h> // for _access
-#endif
-
-#include "ccutil.h"
-#include "fileerr.h"
-
-namespace tesseract {
-/**
- * @brief CCUtil::main_setup - set location of tessdata and name of image
- *
- * @param argv0 - paths to the directory with language files and config files.
- * An actual value of argv0 is used if not nullptr, otherwise TESSDATA_PREFIX is
- * used if not nullptr, next try to use compiled in -DTESSDATA_PREFIX. If
- * previous is not successful - use current directory.
- * @param basename - name of image
- */
-void CCUtil::main_setup(const std::string &argv0, const std::string &basename) {
-  imagebasename = basename; /**< name of image */
-
-  char *tessdata_prefix = getenv("TESSDATA_PREFIX");
-
-  if (!argv0.empty()) {
-    /* Use tessdata prefix from the command line. */
-    datadir = argv0;
-  } else if (tessdata_prefix) {
-    /* Use tessdata prefix from the environment. */
-    datadir = tessdata_prefix;
-#if defined(_WIN32)
-  } else if (datadir.empty() || _access(datadir.c_str(), 0) != 0) {
-    /* Look for tessdata in directory of executable. */
-    char path[_MAX_PATH];
-    DWORD length = GetModuleFileName(nullptr, path, sizeof(path));
-    if (length > 0 && length < sizeof(path)) {
-      char *separator = std::strrchr(path, '\\');
-      if (separator != nullptr) {
-        *separator = '\0';
-        datadir = path;
-        datadir += "/tessdata";
-      }
-    }
-#endif /* _WIN32 */
-#if defined(TESSDATA_PREFIX)
-  } else {
-    // Use tessdata prefix which was compiled in.
-    datadir = TESSDATA_PREFIX "/tessdata";
-#endif
-  }
-
-  // datadir may still be empty:
-  if (datadir.empty()) {
-    datadir = "./";
-  }
-
-  // check for missing directory separator
-  const char *lastchar = datadir.c_str();
-  lastchar += datadir.length() - 1;
-  if ((strcmp(lastchar, "/") != 0) && (strcmp(lastchar, "\\") != 0)) {
-    datadir += "/";
-  }
-}
-} // namespace tesseract