Remove gradechop.h

It only defines the macro partial_split_priority which is only used in findseam.cpp, so move it to that file. Signed-off-by: Stefan Weil <[email protected]>
tesseract-ocr · Oct 12, 2018 · d59f14c · d59f14c
1 parent 2633ba2
commit d59f14c
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 54 deletions.
diff --git 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
@@ -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
@@ -25,7 +25,7 @@
 /*----------------------------------------------------------------------
               I n c l u d e s
 ----------------------------------------------------------------------*/
-#include "gradechop.h"
+
 #include "wordrec.h"
 #include "chop.h"
 #include <algorithm>

diff --git a/src/wordrec/gradechop.h b/src/wordrec/gradechop.h
diff --git 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
@@ -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"