diff --git a/src/ccmain/Makefile.am b/src/ccmain/Makefile.am index c3ee7328..30eca520 100644 --- a/src/ccmain/Makefile.am +++ b/src/ccmain/Makefile.am @@ -42,7 +42,6 @@ noinst_HEADERS = \ paramsd.h \ pgedit.h \ reject.h \ - tessedit.h \ tesseractclass.h \ tessvars.h \ werdit.h diff --git a/src/ccmain/tessedit.cpp b/src/ccmain/tessedit.cpp index f0fc0dcb..6d15ea94 100644 --- a/src/ccmain/tessedit.cpp +++ b/src/ccmain/tessedit.cpp @@ -29,7 +29,6 @@ #include "pgedit.h" #include "reject.h" #include "stopper.h" -#include "tessedit.h" #include "tessvars.h" #include "tprintf.h" #ifndef DISABLED_LEGACY_ENGINE @@ -48,8 +47,6 @@ // config under api #define API_CONFIG "configs/api_config" -ETEXT_DESC* global_monitor = nullptr; // progress monitor - namespace tesseract { // Read a "config" file containing a set of variable, value pairs. diff --git a/src/ccmain/tessedit.h b/src/ccmain/tessedit.h deleted file mode 100644 index 750056b7..00000000 --- a/src/ccmain/tessedit.h +++ /dev/null @@ -1,28 +0,0 @@ -/********************************************************************** - * File: tessedit.h (Formerly tessedit.h) - * Description: Main program for merge of tess and editor. - * Author: Ray Smith - * Created: Tue Jan 07 15:21:46 GMT 1992 - * - * (C) Copyright 1992, 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. - * - **********************************************************************/ - -#ifndef TESSEDIT_H -#define TESSEDIT_H - -class ETEXT_DESC; - - //progress monitor -extern ETEXT_DESC *global_monitor; - -#endif diff --git a/src/ccmain/tesseractclass.h b/src/ccmain/tesseractclass.h index fca87acb..30117a56 100644 --- a/src/ccmain/tesseractclass.h +++ b/src/ccmain/tesseractclass.h @@ -510,7 +510,7 @@ class Tesseract : public Wordrec { const char* lengths); int16_t count_alphanums(const WERD_CHOICE &word); int16_t count_alphas(const WERD_CHOICE &word); - //// tessedit.h //////////////////////////////////////////////////////// + void read_config_file(const char *filename, SetParamConstraint constraint); // Initialize for potentially a set of languages defined by the language // string and recursively any additional languages required by any language