mirror/tesseract
1
0
Fork 0
mirror of https://github.com/tesseract-ocr/tesseract.git synced 2024-11-24 02:59:07 +08:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

GRAPHICS_ENABLED means ScrollView, but the correct #define was not being set

Browse Source 
git-svn-id: https://tesseract-ocr.googlecode.com/svn/trunk@407 d0cd1f9f-072b-0410-8dd7-cf729c803f20
This commit is contained in:
joregan 2010-06-27 16:03:29 +00:00
parent 710f3637dd
commit 5279e34296
5 changed files with 8 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/baseapi.cpp
View File

@ -1652,7 +1652,7 @@ void TessBaseAPI::GetFeatures(INT_FEATURE_ARRAY int_features,
for (block_it.mark_cycle_pt (); !block_it.cycled_list ();
block_it.forward ()) {
BLOCK* block = block_it.data();
#ifndef SCROLLVIEW_DISABLED
#ifndef GRAPHICS_DISABLED
extract_edges(NULL, // Scrollview window.
&page_image, // Image.
&page_image, // Thresholded image.

4
ccmain/adaptions.cpp
View File

@ -556,7 +556,7 @@ void Tesseract::adapt_to_good_ems(WERD_RES *word,
static inT32 word_number = 0;
#ifndef SCROLLVIEW_DISABLED
#ifndef GRAPHICS_DISABLED
ScrollView* demo_win = NULL;
#endif
@ -794,7 +794,7 @@ void Tesseract::adapt_to_good_samples(WERD_RES *word,
static inT32 word_number = 0;
#ifndef SCROLLVIEW_DISABLED
#ifndef GRAPHICS_DISABLED
ScrollView* demo_win = NULL;
#endif

19
configure.ac
View File

@ -73,19 +73,9 @@ AC_ARG_WITH(extra-libraries,
AC_MSG_ERROR([Cannot stat directory $withval])
fi ] )
AC_MSG_CHECKING(--enable-scrollview argument)
AC_ARG_ENABLE(scrollview,
[ --enable-scrollview Enable scrollview (default).],
[enable_scrollview=$enableval],
[enable_scrollview="yes"])
AC_MSG_RESULT($enable_scrollview)
if test "$enable_scrollview" = "no"; then
AC_DEFINE([DISABLE_SCROLLVIEW], [], [Disable scrollview])
fi
AC_MSG_CHECKING(--enable-graphics argument)
AC_ARG_ENABLE(graphics,
[ --enable-graphics Enable graphics (default).],
[ --enable-graphics Enable graphics (ScrollView) (default).],
[enable_graphics=$enableval],
[enable_graphics="yes"])
AC_MSG_RESULT($enable_graphics)
@ -364,7 +354,7 @@ AC_CONFIG_FILES(tessdata/Makefile)
AC_CONFIG_FILES(tessdata/configs/Makefile)
AC_CONFIG_FILES(tessdata/tessconfigs/Makefile)
AC_CONFIG_FILES(testing/Makefile)
if test "$enable_scrollview" = "yes"; then
if test "$enable_graphics" = "yes"; then
AC_CONFIG_FILES(java/Makefile)
AC_CONFIG_FILES(java/com/Makefile)
AC_CONFIG_FILES(java/com/google/Makefile)
@ -406,12 +396,7 @@ AH_BOTTOM([
/* Miscellaneous defines */
#define AUTOCONF 1
#ifdef DISABLE_SCROLLVIEW
#define SCROLLVIEW_DISABLED
#endif
#ifdef DISABLE_GRAPHICS
#define SCROLLVIEW_DISABLED
#define GRAPHICS_DISABLED
#endif

2
textord/alignedblob.cpp
View File

@ -174,7 +174,7 @@ bool AlignedBlob::WithinTestRegion(int detail_level, int x, int y) {
// Display the tab codes of the BLOBNBOXes in this grid.
ScrollView* AlignedBlob::DisplayTabs(const char* window_name,
ScrollView* tab_win) {
#ifndef SCROLLVIEW_DISABLED
#ifndef GRAPHICS_DISABLED
if (tab_win == NULL)
tab_win = MakeWindow(0, 50, window_name);
// For every tab in the grid, display it.

4
wordrec/drawfx.cpp
View File

@ -27,7 +27,7 @@
#include "werd.h"
#include "drawfx.h"
#ifndef SCROLLVIEW_DISABLED
#ifndef GRAPHICS_DISABLED
#define FXDEMOWIN "FXDemo"
#define FXDEMOXPOS 250
#define FXDEMOYPOS 0
@ -79,7 +79,7 @@ void clear_fx_win() { //make features win
fx_win->Line(-WERDWIDTH, bln_x_height + bln_baseline_offset, WERDWIDTH, bln_x_height + bln_baseline_offset);
}
#endif // SCROLLVIEW_DISABLED
#endif // GRAPHICS_DISABLED
/**********************************************************************
* create_fxdebug_win