From 609edd460063111cf7baa618ea2c14b8cb4f663f Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Sat, 7 Jul 2018 21:18:07 +0200 Subject: [PATCH 1/4] Add missing include statement Signed-off-by: Stefan Weil --- src/ccmain/thresholder.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/ccmain/thresholder.cpp b/src/ccmain/thresholder.cpp index 1bed1741..5b83dea5 100644 --- a/src/ccmain/thresholder.cpp +++ b/src/ccmain/thresholder.cpp @@ -21,6 +21,7 @@ #include "thresholder.h" +#include // for uint32_t #include #include "otsuthr.h" From 7e80a850ad3e9119b98ab09d8ddf7f71b77511d2 Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Fri, 6 Jul 2018 21:59:30 +0200 Subject: [PATCH 2/4] Remove unused macros Signed-off-by: Stefan Weil --- src/ccutil/params.h | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/src/ccutil/params.h b/src/ccutil/params.h index ecee6e26..b358b38a 100644 --- a/src/ccutil/params.h +++ b/src/ccutil/params.h @@ -285,18 +285,6 @@ tesseract::ParamsVectors *GlobalParams(); #define double_VAR(name,val,comment)\ tesseract::DoubleParam name(val,#name,comment,false,GlobalParams()) -#define INT_INIT_VAR(name,val,comment)\ - tesseract::IntParam name(val,#name,comment,true,GlobalParams()) - -#define BOOL_INIT_VAR(name,val,comment)\ - tesseract::BoolParam name(val,#name,comment,true,GlobalParams()) - -#define STRING_INIT_VAR(name,val,comment)\ - tesseract::StringParam name(val,#name,comment,true,GlobalParams()) - -#define double_INIT_VAR(name,val,comment)\ - tesseract::DoubleParam name(val,#name,comment,true,GlobalParams()) - #define INT_MEMBER(name, val, comment, vec)\ name(val, #name, comment, false, vec) From 44415a706e2460bb5afd33a4c4efe70a59f3ed13 Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Sat, 7 Jul 2018 12:01:22 +0200 Subject: [PATCH 3/4] Remove unused EXTERN macros Signed-off-by: Stefan Weil --- src/textord/drawedg.cpp | 4 +--- src/textord/pithsync.cpp | 2 -- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/textord/drawedg.cpp b/src/textord/drawedg.cpp index 0a429b54..f677969d 100644 --- a/src/textord/drawedg.cpp +++ b/src/textord/drawedg.cpp @@ -18,7 +18,7 @@ * **********************************************************************/ -#include "drawedg.h" +#include "drawedg.h" // Include automatically generated configuration file if running autoconf. #ifdef HAVE_CONFIG_H @@ -33,8 +33,6 @@ /** default position */ #define IMAGE_YPOS 0 -#define EXTERN - /** * @name create_edges_window * diff --git a/src/textord/pithsync.cpp b/src/textord/pithsync.cpp index 388b4603..a1084f18 100644 --- a/src/textord/pithsync.cpp +++ b/src/textord/pithsync.cpp @@ -28,8 +28,6 @@ #define PROJECTION_MARGIN 10 //arbitrary -#define EXTERN - /********************************************************************** * FPCUTPT::setup * From 8bd95673552ba7b6814922021d6a7c2e7fd76792 Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Sat, 7 Jul 2018 10:05:27 +0200 Subject: [PATCH 4/4] Fix some comments Signed-off-by: Stefan Weil --- src/ccmain/pgedit.cpp | 2 +- src/ccutil/params.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ccmain/pgedit.cpp b/src/ccmain/pgedit.cpp index c20c8f3d..9dba021c 100644 --- a/src/ccmain/pgedit.cpp +++ b/src/ccmain/pgedit.cpp @@ -114,7 +114,7 @@ CMD_EVENTS mode = CHANGE_DISP_CMD_EVENT; // selected words op bool recog_done = false; // recog_all_words was called // These variables should remain global, since they are only used for the -// debug mode (in which only a single Tesseract thread/instance will be exist). +// debug mode (in which only a single Tesseract thread/instance will exist). BITS16 word_display_mode; static ColorationMode color_mode = CM_RAINBOW; BOOL8 display_image = FALSE; diff --git a/src/ccutil/params.h b/src/ccutil/params.h index b358b38a..64e7411c 100644 --- a/src/ccutil/params.h +++ b/src/ccutil/params.h @@ -246,8 +246,8 @@ class DoubleParam : public Param { // // To avoid the problem of undetermined order of static initialization // global_params are accessed through the GlobalParams function that -// initializes the static pointer to global_params only on the first -// first time GlobalParams() is called. +// initializes the static pointer to global_params only on the first time +// GlobalParams() is called. // // TODO(daria): remove GlobalParams() when all global Tesseract // parameters are converted to members.