fix build with -DGRAPHICS_DISABLED

git-svn-id: https://tesseract-ocr.googlecode.com/svn/trunk@981 d0cd1f9f-072b-0410-8dd7-cf729c803f20

ccstruct/ratngs.cpp

@@ -17,6 +17,11 @@
  *
  **********************************************************************/
 
+
+#ifdef HAVE_CONFIG_H
+#include "config_auto.h"
+#endif
+
 #include "ratngs.h"
 
 #include "blobs.h"

classify/adaptmatch.cpp

@@ -19,6 +19,10 @@
 /*-----------------------------------------------------------------------------
           Include Files and Type Defines
 -----------------------------------------------------------------------------*/
+#ifdef HAVE_CONFIG_H
+#include "config_auto.h"
+#endif
+
 #include <ctype.h>
 #include "ambigs.h"
 #include "blobclass.h"
@@ -58,11 +62,6 @@
 #include <assert.h>
 #endif
 
-// Include automatically generated configuration file if running autoconf.
-#ifdef HAVE_CONFIG_H
-#include "config_auto.h"
-#endif
-
 #define ADAPT_TEMPLATE_SUFFIX ".a"
 
 #define MAX_MATCHES         10
@@ -2263,10 +2262,11 @@ void Classify::SetAdaptiveThreshold(FLOAT32 Threshold) {
  * @note Exceptions: none
  * @note History: Fri Mar 22 08:43:52 1991, DSJ, Created.
  */
-#ifndef GRAPHICS_DISABLED
+
 void Classify::ShowBestMatchFor(int shape_id,
                                 const INT_FEATURE_STRUCT* features,
                                 int num_features) {
+#ifndef GRAPHICS_DISABLED
   uinT32 config_mask;
   if (UnusedClassIdIn(PreTrainedTemplates, shape_id)) {
     tprintf("No built-in templates for class/shape %d\n", shape_id);
@@ -2295,8 +2295,8 @@ void Classify::ShowBestMatchFor(int shape_id,
             matcher_debug_flags,
             matcher_debug_separate_windows);
   UpdateMatchDisplay();
+#endif  // GRAPHICS_DISABLED
 }                              /* ShowBestMatchFor */
-#endif
 
 // Returns a string for the classifier class_id: either the corresponding
 // unicharset debug_str or the shape_table_ debug str.

classify/shapeclassifier.cpp

@@ -20,6 +20,10 @@
 //
 ///////////////////////////////////////////////////////////////////////
 
+#ifdef HAVE_CONFIG_H
+#include "config_auto.h"
+#endif
+
 #include "shapeclassifier.h"
 #include "genericvector.h"
 #include "scrollview.h"
@@ -93,6 +97,7 @@ const UNICHARSET& ShapeClassifier::GetUnicharset() const {
 void ShapeClassifier::DebugDisplay(const TrainingSample& sample,
                                    Pix* page_pix,
                                    UNICHAR_ID unichar_id) {
+#ifndef GRAPHICS_DISABLED
   static ScrollView* terminator = NULL;
   if (terminator == NULL) {
     terminator = new ScrollView("XIT", 0, 0, 50, 50, 50, 50, true);
@@ -148,6 +153,7 @@ void ShapeClassifier::DebugDisplay(const TrainingSample& sample,
              ev_type != SVET_CLICK && ev_type != SVET_DESTROY);
   } while (ev_type != SVET_CLICK && ev_type != SVET_DESTROY);
   delete debug_win;
+#endif  // GRAPHICS_DISABLED
 }
 
 // Displays classification as the given shape_id. Creates as many windows

textord/alignedblob.cpp

@@ -17,14 +17,13 @@
 //
 ///////////////////////////////////////////////////////////////////////
 
-#include "alignedblob.h"
-#include "ndminx.h"
-
-// Include automatically generated configuration file if running autoconf.
 #ifdef HAVE_CONFIG_H
 #include "config_auto.h"
 #endif
 
+#include "alignedblob.h"
+#include "ndminx.h"
+
 INT_VAR(textord_debug_tabfind, 0, "Debug tab finding");
 INT_VAR(textord_debug_bugs, 0, "Turn on output related to bugs in tab finding");
 INT_VAR(textord_testregion_left, -1, "Left edge of debug reporting rectangle");

textord/baselinedetect.cpp

@@ -21,6 +21,10 @@
 #define _USE_MATH_DEFINES
 #endif  // _MSC_VER
 
+#ifdef HAVE_CONFIG_H
+#include "config_auto.h"
+#endif
+
 #include "baselinedetect.h"
 
 #include <math.h>

textord/ccnontextdetect.cpp

@@ -17,6 +17,10 @@
 //
 ///////////////////////////////////////////////////////////////////////
 
+#ifdef HAVE_CONFIG_H
+#include "config_auto.h"
+#endif
+
 #include "ccnontextdetect.h"
 #include "imagefind.h"
 #include "strokewidth.h"

textord/colpartition.cpp

@@ -18,6 +18,14 @@
 //
 ///////////////////////////////////////////////////////////////////////
 
+#ifdef _MSC_VER
+#pragma warning(disable:4244)  // Conversion warnings
+#endif
+
+#ifdef HAVE_CONFIG_H
+#include "config_auto.h"
+#endif
+
 #include "colpartition.h"
 #include "colpartitiongrid.h"
 #include "colpartitionset.h"
@@ -26,10 +34,6 @@
 #include "imagefind.h"
 #include "workingpartset.h"
 
-#ifdef _MSC_VER
-#pragma warning(disable:4244)  // Conversion warnings
-#endif
-
 namespace tesseract {
 
 ELIST2IZE(ColPartition)

textord/colpartitiongrid.cpp

@@ -17,6 +17,10 @@
 //
 ///////////////////////////////////////////////////////////////////////
 
+#ifdef HAVE_CONFIG_H
+#include "config_auto.h"
+#endif
+
 #include "colpartitiongrid.h"
 #include "colpartitionset.h"
 #include "imagefind.h"

textord/colpartitionset.cpp

@@ -18,6 +18,10 @@
 //
 ///////////////////////////////////////////////////////////////////////
 
+#ifdef HAVE_CONFIG_H
+#include "config_auto.h"
+#endif
+
 #include "colpartitionset.h"
 #include "ndminx.h"
 #include "workingpartset.h"
@@ -374,14 +378,14 @@ void ColPartitionSet::GetColumnBoxes(int y_bottom, int y_top,
 // Display the edges of the columns at the given y coords.
 void ColPartitionSet::DisplayColumnEdges(int y_bottom, int y_top,
                                          ScrollView* win) {
-  #ifndef GRAPHICS_DISABLED
+#ifndef GRAPHICS_DISABLED
   ColPartition_IT it(&parts_);
   for (it.mark_cycle_pt(); !it.cycled_list(); it.forward()) {
     ColPartition* part = it.data();
     win->Line(part->LeftAtY(y_top), y_top, part->LeftAtY(y_bottom), y_bottom);
     win->Line(part->RightAtY(y_top), y_top, part->RightAtY(y_bottom), y_bottom);
   }
-  #endif  // GRAPHICS_DISABLED
+#endif  // GRAPHICS_DISABLED
 }
 
 // Return the ColumnSpanningType that best explains the columns overlapped

textord/devanagari_processing.cpp

@@ -18,6 +18,10 @@
  *
  **********************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include "config_auto.h"
+#endif
+
 #include "devanagari_processing.h"
 #include "allheaders.h"
 #include "tordmain.h"

textord/drawtord.cpp

@@ -17,15 +17,14 @@
  *
  **********************************************************************/
 
-#include          "pithsync.h"
-#include          "topitch.h"
-#include          "drawtord.h"
-
-// Include automatically generated configuration file if running autoconf.
 #ifdef HAVE_CONFIG_H
 #include "config_auto.h"
 #endif
 
+#include          "pithsync.h"
+#include          "topitch.h"
+#include          "drawtord.h"
+
 #define TO_WIN_XPOS     0       //default window pos
 #define TO_WIN_YPOS     0
 #define TO_WIN_NAME     "Textord"

textord/imagefind.cpp

@@ -22,6 +22,10 @@
 #pragma warning(disable:4244)  // Conversion warnings
 #endif
 
+#ifdef HAVE_CONFIG_H
+#include "config_auto.h"
+#endif
+
 #include "imagefind.h"
 #include "colpartitiongrid.h"
 #include "linlsq.h"
@@ -29,11 +33,6 @@
 #include "statistc.h"
 #include "params.h"
 
-// This entire file is dependent upon leptonica. If you don't have it,
-// you don't get this functionality.
-#ifdef HAVE_CONFIG_H
-#include "config_auto.h"
-#endif
 #include "allheaders.h"
 
 INT_VAR(textord_tabfind_show_images, false, "Show image blobs");

textord/linefind.cpp

@@ -22,6 +22,10 @@
 #pragma warning(disable:4244)  // Conversion warnings
 #endif
 
+#ifdef HAVE_CONFIG_H
+#include "config_auto.h"
+#endif
+
 #include "linefind.h"
 #include "alignedblob.h"
 #include "tabvector.h"
@@ -29,11 +33,6 @@
 #include "edgblob.h"
 #include "openclwrapper.h"
 
-// This entire file is dependent upon leptonica. If you don't have it,
-// then the code doesn't do anything useful.
-#ifdef HAVE_CONFIG_H
-#include "config_auto.h"
-#endif
 #include "allheaders.h"
 
 namespace tesseract {

textord/strokewidth.cpp

@@ -21,6 +21,10 @@
 #pragma warning(disable:4244)  // Conversion warnings
 #endif
 
+#ifdef HAVE_CONFIG_H
+#include "config_auto.h"
+#endif
+
 #include "strokewidth.h"
 
 #include <math.h>
@@ -35,11 +39,6 @@
 #include "textlineprojection.h"
 #include "tordmain.h"  // For SetBlobStrokeWidth.
 
-// Include automatically generated configuration file if running autoconf.
-#ifdef HAVE_CONFIG_H
-#include "config_auto.h"
-#endif
-
 namespace tesseract {
 
 INT_VAR(textord_tabfind_show_strokewidths, 0, "Show stroke widths");
@@ -1871,13 +1870,13 @@ ScrollView* StrokeWidth::DisplayGoodBlobs(const char* window_name,
 }
 
 static void DrawDiacriticJoiner(const BLOBNBOX* blob, ScrollView* window) {
+#ifndef GRAPHICS_DISABLED
   const TBOX& blob_box(blob->bounding_box());
   int top = MAX(blob_box.top(), blob->base_char_top());
   int bottom = MIN(blob_box.bottom(), blob->base_char_bottom());
   int x = (blob_box.left() + blob_box.right()) / 2;
-  #ifndef GRAPHICS_DISABLED
   window->Line(x, top, x, bottom);
-  #endif  // GRAPHICS_DISABLED
+#endif  // GRAPHICS_DISABLED
 }
 
 // Displays blobs colored according to whether or not they are diacritics.

textord/tabfind.cpp

@@ -17,6 +17,10 @@
 //
 ///////////////////////////////////////////////////////////////////////
 
+#ifdef HAVE_CONFIG_H
+#include "config_auto.h"
+#endif
+
 #include "tabfind.h"
 #include "alignedblob.h"
 #include "blobbox.h"
@@ -25,11 +29,6 @@
 #include "linefind.h"
 #include "ndminx.h"
 
-// Include automatically generated configuration file if running autoconf.
-#ifdef HAVE_CONFIG_H
-#include "config_auto.h"
-#endif
-
 namespace tesseract {
 
 // Multiple of box size to search for initial gaps.

textord/tablefind.cpp

@@ -21,12 +21,13 @@
 #pragma warning(disable:4244)  // Conversion warnings
 #endif
 
-#include "tablefind.h"
-#include <math.h>
 #ifdef HAVE_CONFIG_H
 #include "config_auto.h"
 #endif
 
+#include "tablefind.h"
+#include <math.h>
+
 #include "allheaders.h"
 
 #include "colpartitionset.h"
@@ -271,6 +272,8 @@ void TableFinder::LocateTables(ColPartitionGrid* grid,
                                const FCOORD& reskew) {
   // initialize spacing, neighbors, and columns
   InitializePartitions(all_columns);
+
+#ifndef GRAPHICS_DISABLED
   if (textord_show_tables) {
     ScrollView* table_win = MakeWindow(0, 300, "Column Partitions & Neighbors");
     DisplayColPartitions(table_win, &clean_part_grid_, ScrollView::BLUE);
@@ -282,6 +285,8 @@ void TableFinder::LocateTables(ColPartitionGrid* grid,
     table_win = MakeWindow(100, 300, "Fragmented Text");
     DisplayColPartitions(table_win, &fragmented_text_grid_, ScrollView::BLUE);
   }
+#endif  // GRAPHICS_DISABLED
+
   // mark, filter, and smooth candidate table partitions
   MarkTablePartitions();
 
@@ -310,11 +315,13 @@ void TableFinder::LocateTables(ColPartitionGrid* grid,
   ColSegment_LIST table_regions;
   GetTableRegions(&table_columns, &table_regions);
 
+#ifndef GRAPHICS_DISABLED
   if (textord_tablefind_show_mark) {
     ScrollView* table_win = MakeWindow(1200, 300, "Table Columns and Regions");
     DisplayColSegments(table_win, &table_columns, ScrollView::DARK_TURQUOISE);
     DisplayColSegments(table_win, &table_regions, ScrollView::YELLOW);
   }
+#endif  // GRAPHICS_DISABLED
 
   // Merge table regions across columns for tables spanning multiple
   // columns
@@ -330,24 +337,28 @@ void TableFinder::LocateTables(ColPartitionGrid* grid,
     // Remove false alarms consiting of a single column
     DeleteSingleColumnTables();
 
+#ifndef GRAPHICS_DISABLED
     if (textord_show_tables) {
       ScrollView* table_win = MakeWindow(1200, 300, "Detected Table Locations");
       DisplayColPartitions(table_win, &clean_part_grid_, ScrollView::BLUE);
       DisplayColSegments(table_win, &table_columns, ScrollView::KHAKI);
       table_grid_.DisplayBoxes(table_win);
     }
+#endif  // GRAPHICS_DISABLED
 
     // Find table grid structure and reject tables that are malformed.
     RecognizeTables();
     GridMergeTableRegions();
     RecognizeTables();
 
+#ifndef GRAPHICS_DISABLED
     if (textord_show_tables) {
       ScrollView* table_win = MakeWindow(1400, 600, "Recognized Tables");
       DisplayColPartitions(table_win, &clean_part_grid_,
                            ScrollView::BLUE, ScrollView::BLUE);
       table_grid_.DisplayBoxes(table_win);
     }
+#endif  // GRAPHICS_DISABLED
   } else {
     // Remove false alarms consiting of a single column
     // TODO(nbeato): verify this is a NOP after structured table rejection.
@@ -355,12 +366,14 @@ void TableFinder::LocateTables(ColPartitionGrid* grid,
     // supposed to do, this function is obsolete.
     DeleteSingleColumnTables();
 
+#ifndef GRAPHICS_DISABLED
     if (textord_show_tables) {
       ScrollView* table_win = MakeWindow(1500, 300, "Detected Tables");
       DisplayColPartitions(table_win, &clean_part_grid_,
                            ScrollView::BLUE, ScrollView::BLUE);
       table_grid_.DisplayBoxes(table_win);
     }
+#endif  // GRAPHICS_DISABLED
   }
 
   if (textord_dump_table_images)

textord/tablerecog.cpp

@@ -20,6 +20,10 @@
 //
 ///////////////////////////////////////////////////////////////////////
 
+#ifdef HAVE_CONFIG_H
+#include "config_auto.h"
+#endif
+
 #include "tablerecog.h"
 
 namespace tesseract {

textord/tabvector.cpp

@@ -21,6 +21,10 @@
 #pragma warning(disable:4244)  // Conversion warnings
 #endif
 
+#ifdef HAVE_CONFIG_H
+#include "config_auto.h"
+#endif
+
 #include "tabvector.h"
 #include "blobbox.h"
 #include "colfind.h"
@@ -28,11 +32,6 @@
 #include "detlinefit.h"
 #include "statistc.h"
 
-// Include automatically generated configuration file if running autoconf.
-#ifdef HAVE_CONFIG_H
-#include "config_auto.h"
-#endif
-
 namespace tesseract {
 
 // Multiple of height used as a gutter for evaluation search.

textord/textlineprojection.cpp

@@ -11,6 +11,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#ifdef HAVE_CONFIG_H
+#include "config_auto.h"
+#endif
+
 #include "textlineprojection.h"
 #include "allheaders.h"
 #include "bbgrid.h"         // Base class.
@@ -77,7 +81,7 @@ void TextlineProjection::ConstructProjection(TO_BLOCK* input_block,
 // Display the blobs in the window colored according to textline quality.
 void TextlineProjection::PlotGradedBlobs(BLOBNBOX_LIST* blobs,
                                          ScrollView* win) {
-  #ifndef GRAPHICS_DISABLED
+#ifndef GRAPHICS_DISABLED
   BLOBNBOX_IT it(blobs);
   for (it.mark_cycle_pt(); !it.cycled_list(); it.forward()) {
     BLOBNBOX* blob = it.data();
@@ -90,7 +94,7 @@ void TextlineProjection::PlotGradedBlobs(BLOBNBOX_LIST* blobs,
     win->Rectangle(box.left(), box.bottom(), box.right(), box.top());
   }
   win->Update();
-  #endif  // GRAPHICS_DISABLED
+#endif  // GRAPHICS_DISABLED
 }
 
 // Moves blobs that look like they don't sit well on a textline from the

textord/tordmain.cpp

@@ -16,6 +16,11 @@
  ** limitations under the License.
  *
  **********************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config_auto.h"
+#endif
+
 #ifdef __UNIX__
 #include <assert.h>
 #endif
@@ -32,11 +37,6 @@
 #include "tordmain.h"
 #include "secname.h"
 
-// Include automatically generated configuration file if running autoconf.
-#ifdef HAVE_CONFIG_H
-#include "config_auto.h"
-#endif
-
 #include "allheaders.h"
 
 const ERRCODE BLOCKLESS_BLOBS = "Warning:some blobs assigned to no block";

training/mftraining.cpp

@@ -26,6 +26,10 @@
 /**----------------------------------------------------------------------------
           Include Files and Type Defines
 ----------------------------------------------------------------------------**/
+#ifdef HAVE_CONFIG_H
+#include "config_auto.h"
+#endif
+
 #include <string.h>
 #include <stdio.h>
 #define _USE_MATH_DEFINES

training/shapeclustering.cpp

@@ -16,6 +16,10 @@
 //            training data of whole, partial or multiple characters.
 //  Author:   Ray Smith
 
+#ifdef HAVE_CONFIG_H
+#include "config_auto.h"
+#endif
+
 #ifndef USE_STD_NAMESPACE
 #include "base/commandlineflags.h"
 #endif
@@ -51,12 +55,12 @@ int main(int argc, char **argv) {
     return 1;
 
   if (FLAGS_display_cloud_font >= 0) {
-    #ifndef GRAPHICS_DISABLED
+#ifndef GRAPHICS_DISABLED
     trainer->DisplaySamples(FLAGS_canonical_class1.c_str(),
                             FLAGS_display_cloud_font,
                             FLAGS_canonical_class2.c_str(),
                             FLAGS_display_canonical_font);
-    #endif  // GRAPHICS_DISABLED
+#endif  // GRAPHICS_DISABLED
     return 0;
   } else if (!FLAGS_canonical_class1.empty()) {
     trainer->DebugCanonical(FLAGS_canonical_class1.c_str(),

wordrec/drawfx.cpp

@@ -17,15 +17,14 @@
  *
  **********************************************************************/
 
-#include          "drawfx.h"
-#include          "normalis.h"
-#include          "werd.h"
-
-// Include automatically generated configuration file if running autoconf.
 #ifdef HAVE_CONFIG_H
 #include "config_auto.h"
 #endif
 
+#include          "drawfx.h"
+#include          "normalis.h"
+#include          "werd.h"
+
 #ifndef GRAPHICS_DISABLED
 #define FXDEMOWIN     "FXDemo"
 #define FXDEMOXPOS      250