diff --git a/src/wordrec/Makefile.am b/src/wordrec/Makefile.am index 8f8ccbae73..f8c09f23cb 100644 --- a/src/wordrec/Makefile.am +++ b/src/wordrec/Makefile.am @@ -25,7 +25,6 @@ noinst_HEADERS += \ chopper.h \ drawfx.h \ findseam.h \ - gradechop.h \ language_model.h \ lm_consistency.h \ lm_pain_points.h \ diff --git a/src/wordrec/findseam.cpp b/src/wordrec/findseam.cpp index 97df547b70..81055392ee 100644 --- a/src/wordrec/findseam.cpp +++ b/src/wordrec/findseam.cpp @@ -26,7 +26,6 @@ I n c l u d e s ----------------------------------------------------------------------*/ #include "findseam.h" -#include "gradechop.h" #include "plotedges.h" #include "outlines.h" #include "seam.h" @@ -37,6 +36,17 @@ #include "config_auto.h" #endif +/********************************************************************** + * partial_split_priority + * + * Assign a priority to this split based on the features that it has. + * Grade it according to the different rating schemes and return the + * value of its goodness. + **********************************************************************/ + +#define partial_split_priority(split) \ + (grade_split_length(split) + grade_sharpness(split)) + /*---------------------------------------------------------------------- T y p e s ----------------------------------------------------------------------*/ diff --git a/src/wordrec/gradechop.cpp b/src/wordrec/gradechop.cpp index 8dc6edb950..55df37561a 100644 --- a/src/wordrec/gradechop.cpp +++ b/src/wordrec/gradechop.cpp @@ -25,7 +25,7 @@ /*---------------------------------------------------------------------- I n c l u d e s ----------------------------------------------------------------------*/ -#include "gradechop.h" + #include "wordrec.h" #include "chop.h" #include diff --git a/src/wordrec/gradechop.h b/src/wordrec/gradechop.h deleted file mode 100644 index efaa10ca00..0000000000 --- a/src/wordrec/gradechop.h +++ /dev/null @@ -1,49 +0,0 @@ -/* -*-C-*- - ******************************************************************************** - * - * File: gradechop.h (Formerly gradechop.h) - * Description: - * Author: Mark Seaman, SW Productivity - * Created: Fri Oct 16 14:37:00 1987 - * Modified: Tue Jul 9 16:40:39 1991 (Mark Seaman) marks@hpgrlt - * Language: C - * Package: N/A - * Status: Reusable Software Component - * - * (c) Copyright 1987, 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 GRADECHOP_H -#define GRADECHOP_H - -/*---------------------------------------------------------------------- - I n c l u d e s -----------------------------------------------------------------------*/ -#include "seam.h" - -/*---------------------------------------------------------------------- - M a c r o s -----------------------------------------------------------------------*/ -/********************************************************************** - * partial_split_priority - * - * Assign a priority to this split based on the features that it has. - * Grade it according to the different rating schemes and return the - * value of its goodness. - **********************************************************************/ - -#define partial_split_priority(split) \ -(grade_split_length (split) + \ - grade_sharpness (split)) \ - -#endif diff --git a/src/wordrec/tface.cpp b/src/wordrec/tface.cpp index 28d2da8414..0b1aa5e08e 100644 --- a/src/wordrec/tface.cpp +++ b/src/wordrec/tface.cpp @@ -21,7 +21,6 @@ #include "chop.h" #include "chopper.h" #include "globals.h" -#include "gradechop.h" #include "pageres.h" #include "wordrec.h" #include "featdefs.h" diff --git a/src/wordrec/wordrec.h b/src/wordrec/wordrec.h index c4599655d9..a0aaa16814 100644 --- a/src/wordrec/wordrec.h +++ b/src/wordrec/wordrec.h @@ -93,7 +93,6 @@ class Wordrec : public Classify { #include "language_model.h" #include "ratngs.h" #include "matrix.h" -#include "gradechop.h" #include "seam.h" #include "findseam.h" #include "callcpp.h"