Merge pull request #1767 from stweil/unused

Remove unused macros and fix comments
This commit is contained in:
zdenop 2018-07-07 21:55:17 +02:00 committed by GitHub
commit e9cd6024d7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 20 deletions

View File

@ -114,7 +114,7 @@ CMD_EVENTS mode = CHANGE_DISP_CMD_EVENT; // selected words op
bool recog_done = false; // recog_all_words was called bool recog_done = false; // recog_all_words was called
// These variables should remain global, since they are only used for the // 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; BITS16 word_display_mode;
static ColorationMode color_mode = CM_RAINBOW; static ColorationMode color_mode = CM_RAINBOW;
BOOL8 display_image = FALSE; BOOL8 display_image = FALSE;

View File

@ -246,8 +246,8 @@ class DoubleParam : public Param {
// //
// To avoid the problem of undetermined order of static initialization // To avoid the problem of undetermined order of static initialization
// global_params are accessed through the GlobalParams function that // global_params are accessed through the GlobalParams function that
// initializes the static pointer to global_params only on the first // initializes the static pointer to global_params only on the first time
// first time GlobalParams() is called. // GlobalParams() is called.
// //
// TODO(daria): remove GlobalParams() when all global Tesseract // TODO(daria): remove GlobalParams() when all global Tesseract
// parameters are converted to members. // parameters are converted to members.
@ -285,18 +285,6 @@ tesseract::ParamsVectors *GlobalParams();
#define double_VAR(name,val,comment)\ #define double_VAR(name,val,comment)\
tesseract::DoubleParam name(val,#name,comment,false,GlobalParams()) 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)\ #define INT_MEMBER(name, val, comment, vec)\
name(val, #name, comment, false, vec) name(val, #name, comment, false, vec)

View File

@ -18,7 +18,7 @@
* *
**********************************************************************/ **********************************************************************/
#include "drawedg.h" #include "drawedg.h"
// Include automatically generated configuration file if running autoconf. // Include automatically generated configuration file if running autoconf.
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
@ -33,8 +33,6 @@
/** default position */ /** default position */
#define IMAGE_YPOS 0 #define IMAGE_YPOS 0
#define EXTERN
/** /**
* @name create_edges_window * @name create_edges_window
* *

View File

@ -28,8 +28,6 @@
#define PROJECTION_MARGIN 10 //arbitrary #define PROJECTION_MARGIN 10 //arbitrary
#define EXTERN
/********************************************************************** /**********************************************************************
* FPCUTPT::setup * FPCUTPT::setup
* *