From 5202208a8c756be3367e5787e3c800caf6b5bd03 Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Mon, 11 Mar 2019 18:54:31 +0100 Subject: [PATCH] Remove globals.h It only included other files which are already included where needed. Signed-off-by: Stefan Weil --- src/ccmain/control.cpp | 1 - src/ccmain/docqual.cpp | 1 - src/ccmain/output.cpp | 1 - src/ccmain/reject.cpp | 1 - src/ccmain/tessedit.cpp | 1 - src/ccmain/tesseractclass.cpp | 1 - src/classify/adaptive.cpp | 1 - src/classify/cutoffs.cpp | 1 - src/classify/intmatcher.cpp | 1 - src/classify/intproto.cpp | 1 - src/classify/normmatch.cpp | 1 - src/classify/protos.cpp | 1 - src/cutil/Makefile.am | 2 +- src/cutil/globals.h | 33 --------------------------------- src/dict/permdawg.cpp | 1 - src/training/commontraining.cpp | 1 - src/wordrec/tface.cpp | 1 - 17 files changed, 1 insertion(+), 49 deletions(-) delete mode 100644 src/cutil/globals.h diff --git a/src/ccmain/control.cpp b/src/ccmain/control.cpp index 9ac86824bd..750ac4faf2 100644 --- a/src/ccmain/control.cpp +++ b/src/ccmain/control.cpp @@ -35,7 +35,6 @@ #include "drawfx.h" #include "fixspace.h" #endif -#include "globals.h" #include "lstmrecognizer.h" #include "ocrclass.h" #include "output.h" diff --git a/src/ccmain/docqual.cpp b/src/ccmain/docqual.cpp index ce897028bc..a3a8c4bb6c 100644 --- a/src/ccmain/docqual.cpp +++ b/src/ccmain/docqual.cpp @@ -22,7 +22,6 @@ #include "reject.h" #include "tesscallback.h" #include "tessvars.h" -#include "globals.h" #include "tesseractclass.h" namespace tesseract{ diff --git a/src/ccmain/output.cpp b/src/ccmain/output.cpp index bdd2e23c42..38d8afcb9f 100644 --- a/src/ccmain/output.cpp +++ b/src/ccmain/output.cpp @@ -26,7 +26,6 @@ #include "reject.h" #include "docqual.h" #include "output.h" -#include "globals.h" #include "tesseractclass.h" #define EPAPER_EXT ".ep" diff --git a/src/ccmain/reject.cpp b/src/ccmain/reject.cpp index bc4623a395..533e857d6a 100644 --- a/src/ccmain/reject.cpp +++ b/src/ccmain/reject.cpp @@ -46,7 +46,6 @@ int16_t Tesseract::safe_dict_word(const WERD_RES *werd_res) { #include "control.h" #include "docqual.h" #include "globaloc.h" // For err_exit. -#include "globals.h" #include "helpers.h" #include "tesseractclass.h" diff --git a/src/ccmain/tessedit.cpp b/src/ccmain/tessedit.cpp index 4e0298dee9..1822d44905 100644 --- a/src/ccmain/tessedit.cpp +++ b/src/ccmain/tessedit.cpp @@ -37,7 +37,6 @@ #include "intmatcher.h" #include "chop.h" #endif -#include "globals.h" #ifndef ANDROID_BUILD #include "lstmrecognizer.h" #endif diff --git a/src/ccmain/tesseractclass.cpp b/src/ccmain/tesseractclass.cpp index 128114d3f2..c39fdd67be 100644 --- a/src/ccmain/tesseractclass.cpp +++ b/src/ccmain/tesseractclass.cpp @@ -44,7 +44,6 @@ #include "allheaders.h" #include "edgblob.h" #include "equationdetect.h" -#include "globals.h" #ifndef ANDROID_BUILD #include "lstmrecognizer.h" #endif diff --git a/src/classify/adaptive.cpp b/src/classify/adaptive.cpp index 14762559cc..a751aac7b4 100644 --- a/src/classify/adaptive.cpp +++ b/src/classify/adaptive.cpp @@ -21,7 +21,6 @@ ----------------------------------------------------------------------------*/ #include "adaptive.h" #include "emalloc.h" -#include "globals.h" #include "classify.h" #include diff --git a/src/classify/cutoffs.cpp b/src/classify/cutoffs.cpp index 1daa40cc1f..1f7da59aca 100644 --- a/src/classify/cutoffs.cpp +++ b/src/classify/cutoffs.cpp @@ -23,7 +23,6 @@ #include #include "classify.h" -#include "globals.h" #include "helpers.h" #include "serialis.h" #include "unichar.h" diff --git a/src/classify/intmatcher.cpp b/src/classify/intmatcher.cpp index 3b1be4e543..d90a1d8c34 100644 --- a/src/classify/intmatcher.cpp +++ b/src/classify/intmatcher.cpp @@ -29,7 +29,6 @@ #include "callcpp.h" #include "scrollview.h" #include "float2int.h" -#include "globals.h" #include "helpers.h" #include "classify.h" #include "shapetable.h" diff --git a/src/classify/intproto.cpp b/src/classify/intproto.cpp index a34d6fd56b..15b828e4e7 100644 --- a/src/classify/intproto.cpp +++ b/src/classify/intproto.cpp @@ -29,7 +29,6 @@ #include "emalloc.h" #include "fontinfo.h" #include "genericvector.h" -#include "globals.h" #include "helpers.h" #include "intproto.h" #include "mfoutline.h" diff --git a/src/classify/normmatch.cpp b/src/classify/normmatch.cpp index 311bf794ac..10d21add31 100644 --- a/src/classify/normmatch.cpp +++ b/src/classify/normmatch.cpp @@ -26,7 +26,6 @@ #include "classify.h" #include "clusttool.h" #include "emalloc.h" -#include "globals.h" #include "helpers.h" #include "normfeat.h" #include "unicharset.h" diff --git a/src/classify/protos.cpp b/src/classify/protos.cpp index 6cbfcb74b2..eb07cd5fbb 100644 --- a/src/classify/protos.cpp +++ b/src/classify/protos.cpp @@ -23,7 +23,6 @@ #include "emalloc.h" #include "callcpp.h" #include "tprintf.h" -#include "globals.h" #include "classify.h" #include "params.h" #include "intproto.h" diff --git a/src/cutil/Makefile.am b/src/cutil/Makefile.am index 3b9d4ca6a5..69d32ee67a 100644 --- a/src/cutil/Makefile.am +++ b/src/cutil/Makefile.am @@ -9,7 +9,7 @@ endif noinst_HEADERS = \ bitvec.h callcpp.h cutil.h cutil_class.h \ - emalloc.h globals.h \ + emalloc.h \ oldlist.h structures.h noinst_LTLIBRARIES = libtesseract_cutil.la diff --git a/src/cutil/globals.h b/src/cutil/globals.h deleted file mode 100644 index d4271a7fe6..0000000000 --- a/src/cutil/globals.h +++ /dev/null @@ -1,33 +0,0 @@ -/* -*-C-*- - ****************************************************************************** - * - * File: globals.h (Formerly globals.h) - * Description: Global Variables for Wise Owl - * Author: Mark Seaman, OCR Technology - * Created: Thu Dec 21 11:38:36 1989 - * Modified: Thu Jan 4 17:13:00 1990 (Mark Seaman) marks@hpgrlt - * Language: C - * Package: N/A - * Status: Experimental (Do Not Distribute) - * - * (c) Copyright 1989, Hewlett-Packard Company. - ** 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 GLOBALS_H -#define GLOBALS_H - -#include "unicharset.h" -#include "strngs.h" - -#include - -#endif diff --git a/src/dict/permdawg.cpp b/src/dict/permdawg.cpp index 87456fcfa2..4553767f97 100644 --- a/src/dict/permdawg.cpp +++ b/src/dict/permdawg.cpp @@ -27,7 +27,6 @@ ----------------------------------------------------------------------*/ #include "dawg.h" -#include "globals.h" #include "stopper.h" #include "tprintf.h" #include "params.h" diff --git a/src/training/commontraining.cpp b/src/training/commontraining.cpp index e7a2673eea..5ef3692efb 100644 --- a/src/training/commontraining.cpp +++ b/src/training/commontraining.cpp @@ -71,7 +71,6 @@ void ParseArguments(int* argc, char ***argv) { #include "emalloc.h" #include "featdefs.h" #include "fontinfo.h" -#include "globals.h" #include "intfeaturespace.h" #include "mastertrainer.h" #include "mf.h" diff --git a/src/wordrec/tface.cpp b/src/wordrec/tface.cpp index f7181d7d5e..74ee659ea9 100644 --- a/src/wordrec/tface.cpp +++ b/src/wordrec/tface.cpp @@ -18,7 +18,6 @@ #include "callcpp.h" #include "chop.h" -#include "globals.h" #include "pageres.h" #include "wordrec.h" #include "featdefs.h"