diff --git a/src/classify/Makefile.am b/src/classify/Makefile.am index 933ff1d690..9b286c074e 100644 --- a/src/classify/Makefile.am +++ b/src/classify/Makefile.am @@ -23,7 +23,6 @@ noinst_HEADERS += \ adaptive.h \ cluster.h \ clusttool.h \ - cutoffs.h \ errorcounter.h \ featdefs.h \ float2int.h \ diff --git a/src/classify/classify.h b/src/classify/classify.h index 0ba262d06b..884ff64986 100644 --- a/src/classify/classify.h +++ b/src/classify/classify.h @@ -145,7 +145,7 @@ class Classify : public CCStruct { const uint8_t* normalization_factors, const uint16_t* expected_num_features, GenericVector* results); - void ReadNewCutoffs(TFile* fp, CLASS_CUTOFF_ARRAY Cutoffs); + void ReadNewCutoffs(TFile* fp, uint16_t* Cutoffs); void PrintAdaptedTemplates(FILE *File, ADAPT_TEMPLATES Templates); void WriteAdaptedTemplates(FILE *File, ADAPT_TEMPLATES Templates); ADAPT_TEMPLATES ReadAdaptedTemplates(TFile* File); diff --git a/src/classify/cutoffs.cpp b/src/classify/cutoffs.cpp index da010eaf5b..59d8d7fb09 100644 --- a/src/classify/cutoffs.cpp +++ b/src/classify/cutoffs.cpp @@ -17,7 +17,6 @@ /*---------------------------------------------------------------------------- Include Files and Type Defines ----------------------------------------------------------------------------*/ -#include "cutoffs.h" #include #include // for std::istringstream @@ -41,7 +40,7 @@ namespace tesseract { * @param fp file containing cutoff definitions * @param Cutoffs array to put cutoffs into */ -void Classify::ReadNewCutoffs(TFile* fp, CLASS_CUTOFF_ARRAY Cutoffs) { +void Classify::ReadNewCutoffs(TFile* fp, uint16_t* Cutoffs) { int Cutoff; if (shape_table_ != nullptr) { diff --git a/src/classify/cutoffs.h b/src/classify/cutoffs.h deleted file mode 100644 index ebc67e27f6..0000000000 --- a/src/classify/cutoffs.h +++ /dev/null @@ -1,45 +0,0 @@ -/****************************************************************************** - ** Filename: cutoffs.h - ** Purpose: Routines to manipulate an array of class cutoffs. - ** Author: Dan Johnson - ** - ** (c) Copyright Hewlett-Packard Company, 1988. - ** 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 CUTOFFS_H -#define CUTOFFS_H - -/**---------------------------------------------------------------------------- - Include Files and Type Defines -----------------------------------------------------------------------------**/ -#include "matchdefs.h" - -typedef uint16_t CLASS_CUTOFF_ARRAY[MAX_NUM_CLASSES]; - -/**---------------------------------------------------------------------------- - Public Function Prototypes -----------------------------------------------------------------------------**/ - -/* -#if defined(__STDC__) || defined(__cplusplus) -# define _ARGS(s) s -#else -# define _ARGS(s) () -#endif*/ - -/* cutoffs.c -void ReadNewCutoffs - _ARGS((char *Filename, - CLASS_CUTOFF_ARRAY Cutoffs)); -#undef _ARGS -*/ -#endif diff --git a/src/classify/intmatcher.h b/src/classify/intmatcher.h index 170510e493..53a300f70f 100644 --- a/src/classify/intmatcher.h +++ b/src/classify/intmatcher.h @@ -35,7 +35,6 @@ extern INT_VAR_H(classify_integer_matcher_multiplier, 10, Include Files and Type Defines ----------------------------------------------------------------------------**/ #include "intproto.h" -#include "cutoffs.h" namespace tesseract { struct UnicharRating;