Skip to content

Commit d59f14c

Browse files
committed
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 <sw@weilnetz.de>
1 parent 2633ba2 commit d59f14c

File tree

6 files changed

+12
-54
lines changed

6 files changed

+12
-54
lines changed

src/wordrec/Makefile.am

-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ noinst_HEADERS += \
2525
chopper.h \
2626
drawfx.h \
2727
findseam.h \
28-
gradechop.h \
2928
language_model.h \
3029
lm_consistency.h \
3130
lm_pain_points.h \

src/wordrec/findseam.cpp

+11-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
I n c l u d e s
2727
----------------------------------------------------------------------*/
2828
#include "findseam.h"
29-
#include "gradechop.h"
3029
#include "plotedges.h"
3130
#include "outlines.h"
3231
#include "seam.h"
@@ -37,6 +36,17 @@
3736
#include "config_auto.h"
3837
#endif
3938

39+
/**********************************************************************
40+
* partial_split_priority
41+
*
42+
* Assign a priority to this split based on the features that it has.
43+
* Grade it according to the different rating schemes and return the
44+
* value of its goodness.
45+
**********************************************************************/
46+
47+
#define partial_split_priority(split) \
48+
(grade_split_length(split) + grade_sharpness(split))
49+
4050
/*----------------------------------------------------------------------
4151
T y p e s
4252
----------------------------------------------------------------------*/

src/wordrec/gradechop.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
/*----------------------------------------------------------------------
2626
I n c l u d e s
2727
----------------------------------------------------------------------*/
28-
#include "gradechop.h"
28+
2929
#include "wordrec.h"
3030
#include "chop.h"
3131
#include <algorithm>

src/wordrec/gradechop.h

-49
This file was deleted.

src/wordrec/tface.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
#include "chop.h"
2222
#include "chopper.h"
2323
#include "globals.h"
24-
#include "gradechop.h"
2524
#include "pageres.h"
2625
#include "wordrec.h"
2726
#include "featdefs.h"

src/wordrec/wordrec.h

-1
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@ class Wordrec : public Classify {
9393
#include "language_model.h"
9494
#include "ratngs.h"
9595
#include "matrix.h"
96-
#include "gradechop.h"
9796
#include "seam.h"
9897
#include "findseam.h"
9998
#include "callcpp.h"

0 commit comments

Comments
 (0)