move include of config_auto.h to not conflict with local types. Not finished

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

Makefile.am

@@ -1,7 +1,10 @@
 # TODO(luc) Add 'doc' to this list when ready
 ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = po ccstruct ccutil classify cutil dict image textord viewer wordrec ccmain training tessdata testing java api
+SUBDIRS = ccstruct ccutil classify cutil dict image textord viewer wordrec ccmain training tessdata testing java api
+if USING_GETTEXT
+SUBDIRS += po
 AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\"
+endif
 
 EXTRA_DIST = config/config.rpath  eurotext.tif phototest.tif ReleaseNotes \
       acinclude.m4 config configure.ac runautoconf tesseract.spec

Makefile.in

@@ -33,6 +33,7 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
+@USING_GETTEXT_TRUE@am__append_1 = po
 subdir = .
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(top_srcdir)/config/config.h.in \
@@ -67,7 +68,8 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
 	distdir dist dist-all distcheck
 ETAGS = etags
 CTAGS = ctags
-DIST_SUBDIRS = $(SUBDIRS)
+DIST_SUBDIRS = ccstruct ccutil classify cutil dict image textord \
+	viewer wordrec ccmain training tessdata testing java api po
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
@@ -251,8 +253,10 @@ top_srcdir = @top_srcdir@
 
 # TODO(luc) Add 'doc' to this list when ready
 ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = po ccstruct ccutil classify cutil dict image textord viewer wordrec ccmain training tessdata testing java api
+SUBDIRS = ccstruct ccutil classify cutil dict image textord viewer \
-AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\"
+	wordrec ccmain training tessdata testing java api \
+	$(am__append_1)
+@USING_GETTEXT_TRUE@AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\"
 EXTRA_DIST = config/config.rpath  eurotext.tif phototest.tif ReleaseNotes \
       acinclude.m4 config configure.ac runautoconf tesseract.spec
 

api/baseapi.cpp

@@ -17,16 +17,6 @@
  *
  **********************************************************************/
 
-// Include automatically generated configuration file if running autoconf.
-#ifdef HAVE_CONFIG_H
-#include "config_auto.h"
-#endif
-
-#ifdef HAVE_LIBLEPT
-// Include leptonica library only if autoconf (or makefile etc) tell us to.
-#include "allheaders.h"
-#endif
-
 #include "baseapi.h"
 
 #include "thresholder.h"
@@ -58,6 +48,16 @@
 #include "chopper.h"
 #include "matchtab.h"
 
+// Include automatically generated configuration file if running autoconf.
+#ifdef HAVE_CONFIG_H
+#include "config_auto.h"
+#endif
+
+#ifdef HAVE_LIBLEPT
+// Include leptonica library only if autoconf (or makefile etc) tell us to.
+#include "allheaders.h"
+#endif
+
 namespace tesseract {
 
 // Minimum sensible image size to be worth running tesseract.

api/tesseractmain.cpp

@@ -48,7 +48,7 @@
 #ifdef HAVE_CONFIG_H
 #include "config_auto.h"
 #endif
-#ifdef USE_NLS
+#ifdef USING_GETTEXT
 #include <libintl.h>
 #include <locale.h>
 #define _(x) gettext(x)
@@ -179,7 +179,7 @@ void TesseractImage(const char* input_file, IMAGE* image, Pix* pix, int page_ind
 int main(int argc, char **argv) {
   STRING outfile;               //output file
 
-#ifdef USE_NLS
+#ifdef USING_GETTEXT
   setlocale (LC_ALL, "");
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);

ccmain/adaptions.cpp

@@ -25,11 +25,6 @@
 
 #include "mfcpch.h"
 
-// Include automatically generated configuration file if running autoconf.
-#ifdef HAVE_CONFIG_H
-#include "config_auto.h"
-#endif
-
 #ifdef __UNIX__
 #include          <assert.h>
 #endif
@@ -51,6 +46,11 @@
 #include          "secname.h"
 #include          "tesseractclass.h"
 
+// Include automatically generated configuration file if running autoconf.
+#ifdef HAVE_CONFIG_H
+#include "config_auto.h"
+#endif
+
 inT32 demo_word = 0;
 
 #define WINDOWNAMESIZE    13     /*max size of name */

ccmain/applybox.cpp

@@ -18,20 +18,10 @@
  **********************************************************************/
 #include "mfcpch.h"
 
-// Include automatically generated configuration file if running autoconf.
-#ifdef HAVE_CONFIG_H
-#include "config_auto.h"
-#endif
-
 #ifdef _MSC_VER
 #pragma warning(disable:4244)  // Conversion warnings
 #endif
 
-#ifdef HAVE_LIBLEPT
-// Include leptonica library only if autoconf (or makefile etc) tell us to.
-#include "allheaders.h"
-#endif
-
 #include "applybox.h"
 #include <ctype.h>
 #include <string.h>
@@ -58,6 +48,16 @@
 #include          "wordstats.h"
 #endif
 
+// Include automatically generated configuration file if running autoconf.
+#ifdef HAVE_CONFIG_H
+#include "config_auto.h"
+#endif
+
+#ifdef HAVE_LIBLEPT
+// Include leptonica library only if autoconf (or makefile etc) tell us to.
+#include "allheaders.h"
+#endif
+
 #define EXTERN
 EXTERN BOOL_VAR (applybox_rebalance, TRUE, "Drop dead");
 EXTERN INT_VAR (applybox_debug, 5, "Debug level");

ccmain/charcut.cpp

@@ -18,11 +18,6 @@
  **********************************************************************/
 
 #include "mfcpch.h"
-// Include automatically generated configuration file if running autoconf.
-#ifdef HAVE_CONFIG_H
-#include "config_auto.h"
-#endif
-
 #include          "charcut.h"
 #include          "imgs.h"
 #include          "svshowim.h"
@@ -30,6 +25,11 @@
 #include          "notdll.h"
 #include	  "scrollview.h"
 
+// Include automatically generated configuration file if running autoconf.
+#ifdef HAVE_CONFIG_H
+#include "config_auto.h"
+#endif
+
 #define LARGEST(a,b) ( (a) > (b) ? (a) : (b) )
 #define SMALLEST(a,b) ( (a) > (b) ? (b) : (a) )
 #define BUG_OFFSET 1

ccmain/charsample.cpp

@@ -20,11 +20,6 @@
 
 #include "mfcpch.h"
 
-// Include automatically generated configuration file if running autoconf.
-#ifdef HAVE_CONFIG_H
-#include "config_auto.h"
-#endif
-
 #include <stdio.h>
 #include          <ctype.h>
 #include          <math.h>
@@ -43,6 +38,11 @@
 #include          "notdll.h"
 #include          "tesseractclass.h"
 
+// Include automatically generated configuration file if running autoconf.
+#ifdef HAVE_CONFIG_H
+#include "config_auto.h"
+#endif
+
 extern inT32 demo_word;          // Hack for demos
 
 ELISTIZE (CHAR_SAMPLE) ELISTIZE (CHAR_SAMPLES) CHAR_SAMPLE::CHAR_SAMPLE () {

ccmain/control.cpp

@@ -20,11 +20,6 @@
 
 #include          "mfcpch.h"
 
-// Include automatically generated configuration file if running autoconf.
-#ifdef HAVE_CONFIG_H
-#include "config_auto.h"
-#endif
-
 #include          "mainblk.h"
 #include          <string.h>
 #include          <math.h>
@@ -59,6 +54,11 @@
 #include "globals.h"
 #include "tesseractclass.h"
 
+// Include automatically generated configuration file if running autoconf.
+#ifdef HAVE_CONFIG_H
+#include "config_auto.h"
+#endif
+
 #define MIN_FONT_ROW_COUNT  8
 #define MAX_XHEIGHT_DIFF  3
 

ccmain/matmatch.cpp

@@ -18,11 +18,6 @@
  **********************************************************************/
 
 #include "mfcpch.h"
-// Include automatically generated configuration file if running autoconf.
-#ifdef HAVE_CONFIG_H
-#include "config_auto.h"
-#endif
-
 #include          <stdlib.h>
 #include          <math.h>
 #include          <string.h>
@@ -43,6 +38,11 @@
 #include          "secname.h"
 #include "svshowim.h"
 
+// Include automatically generated configuration file if running autoconf.
+#ifdef HAVE_CONFIG_H
+#include "config_auto.h"
+#endif
+
 #define EXTERN
 
 EXTERN BOOL_VAR (tessedit_display_mm, FALSE, "Display matrix matches");

ccmain/pgedit.cpp

@@ -21,11 +21,6 @@
 #pragma warning(disable:4244)  // Conversion warnings
 #endif
 
-// Include automatically generated configuration file if running autoconf.
-#ifdef HAVE_CONFIG_H
-#include "config_auto.h"
-#endif
-
 #include          "pgedit.h"
 
 #include          <ctype.h>
@@ -50,6 +45,11 @@
 
 #include          "blread.h"
 
+// Include automatically generated configuration file if running autoconf.
+#ifdef HAVE_CONFIG_H
+#include "config_auto.h"
+#endif
+
 #ifndef GRAPHICS_DISABLED
 #define ASC_HEIGHT     (2 * bln_baseline_offset + bln_x_height)
 #define X_HEIGHT       (bln_baseline_offset + bln_x_height)

ccmain/reject.cpp

@@ -24,11 +24,6 @@
 
 #include "mfcpch.h"
 
-// Include automatically generated configuration file if running autoconf.
-#ifdef HAVE_CONFIG_H
-#include "config_auto.h"
-#endif
-
 #include          "tessvars.h"
 #ifdef __UNIX__
 #include          <assert.h>
@@ -58,6 +53,11 @@
 #include "tesseractclass.h"
 #include          "notdll.h"
 
+// Include automatically generated configuration file if running autoconf.
+#ifdef HAVE_CONFIG_H
+#include "config_auto.h"
+#endif
+
 CLISTIZEH (STRING) CLISTIZE (STRING)
 #define EXTERN
 EXTERN

ccmain/varabled.cpp

@@ -19,6 +19,13 @@
 //
 // The variables editor is used to edit all the variables used within
 // tesseract from the ui.
+#ifdef WIN32
+#else
+#include <stdlib.h>
+#include <stdio.h>
+#endif
+
+#include <map>
 
 // Include automatically generated configuration file if running autoconf.
 #ifdef HAVE_CONFIG_H
@@ -28,13 +35,6 @@
 #ifndef GRAPHICS_DISABLED
 #include "varabled.h"
 
-#ifdef WIN32
-#else
-#include <stdlib.h>
-#include <stdio.h>
-#endif
-
-#include <map>
 
 #include "scrollview.h"
 #include "svmnode.h"

ccstruct/callcpp.cpp

@@ -17,28 +17,28 @@
  *
  **********************************************************************/
 
+#include "mfcpch.h"
+#include "errcode.h"
+#ifdef __UNIX__
+#include <assert.h>
+#include <stdarg.h>
+#endif
+#include <time.h>
+#include "memry.h"
+#include "scrollview.h"
+//#include          "evnts.h"
+#include "varable.h"
+#include "callcpp.h"
+#include "tprintf.h"
+//#include                                      "strace.h"
+#include "host.h"
+#include "unichar.h"
+
 // Include automatically generated configuration file if running autoconf.
 #ifdef HAVE_CONFIG_H
 #include "config_auto.h"
 #endif
 
-#include "mfcpch.h"
-#include          "errcode.h"
-#ifdef __UNIX__
-#include          <assert.h>
-#include <stdarg.h>
-#endif
-#include          <time.h>
-#include          "memry.h"
-#include          "scrollview.h"
-//#include          "evnts.h"
-#include          "varable.h"
-#include          "callcpp.h"
-#include          "tprintf.h"
-//#include                                      "strace.h"
-#include          "host.h"
-#include "unichar.h"
-
 //extern "C" {
 
 INT_VAR (tess_cp_mapping0, 0, "Mappings for class pruner distance");

ccstruct/coutln.cpp

@@ -17,11 +17,6 @@
  *
  **********************************************************************/
 
-// Include automatically generated configuration file if running autoconf.
-#ifdef HAVE_CONFIG_H
-#include "config_auto.h"
-#endif
-
 #include "mfcpch.h"
 #include          <string.h>
 #ifdef __UNIX__
@@ -29,6 +24,11 @@
 #endif
 #include          "coutln.h"
 
+// Include automatically generated configuration file if running autoconf.
+#ifdef HAVE_CONFIG_H
+#include "config_auto.h"
+#endif
+
 ELISTIZE_S (C_OUTLINE)
 ICOORD C_OUTLINE::step_coords[4] = {
   ICOORD (-1, 0), ICOORD (0, -1), ICOORD (1, 0), ICOORD (0, 1)

ccstruct/lmedsq.cpp

@@ -17,11 +17,6 @@
  *
  **********************************************************************/
 
-// Include automatically generated configuration file if running autoconf.
-#ifdef HAVE_CONFIG_H
-#include "config_auto.h"
-#endif
-
 #include "mfcpch.h"
 #include          <stdlib.h>
 #include          "statistc.h"
@@ -29,6 +24,11 @@
 #include          "statistc.h"
 #include          "lmedsq.h"
 
+// Include automatically generated configuration file if running autoconf.
+#ifdef HAVE_CONFIG_H
+#include "config_auto.h"
+#endif
+
 #define EXTERN
 
 EXTERN INT_VAR (lms_line_trials, 12, "Number of linew fits to do");

ccstruct/ocrrow.cpp

@@ -17,15 +17,15 @@
  *
  **********************************************************************/
 
+#include "mfcpch.h"
+#include          "ocrrow.h"
+#include          "blobbox.h"
+
 // Include automatically generated configuration file if running autoconf.
 #ifdef HAVE_CONFIG_H
 #include "config_auto.h"
 #endif
 
-#include "mfcpch.h"
-#include          "ocrrow.h"
-#include          "blobbox.h"
-
 ELISTIZE_S (ROW)
 /**********************************************************************
  * ROW::ROW

ccstruct/pdblock.cpp

@@ -17,17 +17,17 @@
  *
  **********************************************************************/
 
-// Include automatically generated configuration file if running autoconf.
-#ifdef HAVE_CONFIG_H
-#include "config_auto.h"
-#endif
-
 #include "mfcpch.h"
 #include          <stdlib.h>
 #include          "blckerr.h"
 #include          "pdblock.h"
 #include          "svshowim.h"
 
+// Include automatically generated configuration file if running autoconf.
+#ifdef HAVE_CONFIG_H
+#include "config_auto.h"
+#endif
+
 #include          "hpddef.h"     //must be last (handpd.dll)
 
 #define BLOCK_LABEL_HEIGHT  150  //char height of block id

ccstruct/polyblk.cpp

@@ -17,11 +17,6 @@
  *
  **********************************************************************/
 
-// Include automatically generated configuration file if running autoconf.
-#ifdef HAVE_CONFIG_H
-#include "config_auto.h"
-#endif
-
 #include "mfcpch.h"
 #include <ctype.h>
 #include <math.h>
@@ -29,6 +24,11 @@
 #include "elst.h"
 #include "polyblk.h"
 
+// Include automatically generated configuration file if running autoconf.
+#ifdef HAVE_CONFIG_H
+#include "config_auto.h"
+#endif
+
 #include "hpddef.h"     // must be last (handpd.dll)
 
 #define PBLOCK_LABEL_SIZE 150

ccstruct/polyblob.cpp

@@ -17,11 +17,6 @@
  *
  **********************************************************************/
 
-// Include automatically generated configuration file if running autoconf.
-#ifdef HAVE_CONFIG_H
-#include "config_auto.h"
-#endif
-
 #include "mfcpch.h"
 #include          "varable.h"
 #include          "ocrrow.h"
@@ -29,6 +24,11 @@
 //#include                                                      "lapoly.h"
 #include          "polyaprx.h"
 
+// Include automatically generated configuration file if running autoconf.
+#ifdef HAVE_CONFIG_H
+#include "config_auto.h"
+#endif
+
 #define EXTERN
 
 EXTERN BOOL_VAR (polygon_tess_approximation, TRUE,

ccstruct/poutline.cpp

@@ -17,14 +17,14 @@
  *
  **********************************************************************/
 
+#include "mfcpch.h"
+#include          "poutline.h"
+
 // Include automatically generated configuration file if running autoconf.
 #ifdef HAVE_CONFIG_H
 #include "config_auto.h"
 #endif
 
-#include "mfcpch.h"
-#include          "poutline.h"
-
 ELISTIZE_S (OUTLINE)
 /**********************************************************************
  * OUTLINE::OUTLINE

ccstruct/quspline.cpp

@@ -18,15 +18,15 @@
  **********************************************************************/
 
 #include "mfcpch.h"
+#include          "memry.h"
+#include          "quadlsq.h"
+#include          "quspline.h"
+
 // Include automatically generated configuration file if running autoconf.
 #ifdef HAVE_CONFIG_H
 #include "config_auto.h"
 #endif
 
-#include          "memry.h"
-#include          "quadlsq.h"
-#include          "quspline.h"
-
 #define QSPLINE_PRECISION 16     //no of steps to draw
 
 /**********************************************************************

ccstruct/rect.cpp

@@ -17,14 +17,14 @@
  *
  **********************************************************************/
 
+#include          "mfcpch.h"     //precompiled headers
+#include          "rect.h"
+
 // Include automatically generated configuration file if running autoconf.
 #ifdef HAVE_CONFIG_H
 #include "config_auto.h"
 #endif
 
-#include          "mfcpch.h"     //precompiled headers
-#include          "rect.h"
-
 /**********************************************************************
  * TBOX::TBOX()  Constructor from 2 ICOORDS
  *

ccstruct/statistc.cpp

@@ -17,11 +17,6 @@
  *
  **********************************************************************/
 
-// Include automatically generated configuration file if running autoconf.
-#ifdef HAVE_CONFIG_H
-#include "config_auto.h"
-#endif
-
 #include          "mfcpch.h"     //precompiled headers
 #include          <string.h>
 #include          <math.h>
@@ -31,6 +26,11 @@
 #include          "tprintf.h"
 #include          "statistc.h"
 
+// Include automatically generated configuration file if running autoconf.
+#ifdef HAVE_CONFIG_H
+#include "config_auto.h"
+#endif
+
 #define SEED1       0x1234       //default seeds
 #define SEED2       0x5678
 #define SEED3       0x9abc

ccstruct/stepblob.cpp

@@ -17,14 +17,14 @@
  *
  **********************************************************************/
 
+#include "mfcpch.h"
+#include          "stepblob.h"
+
 // Include automatically generated configuration file if running autoconf.
 #ifdef HAVE_CONFIG_H
 #include "config_auto.h"
 #endif
 
-#include "mfcpch.h"
-#include          "stepblob.h"
-
 ELISTIZE_S (C_BLOB)
 /**********************************************************************
  * position_outline

ccstruct/werd.cpp

@@ -18,15 +18,15 @@
  **********************************************************************/
 
 #include "mfcpch.h"
+#include          "blckerr.h"
+#include          "linlsq.h"
+#include          "werd.h"
+
 // Include automatically generated configuration file if running autoconf.
 #ifdef HAVE_CONFIG_H
 #include "config_auto.h"
 #endif
 
-#include          "blckerr.h"
-#include          "linlsq.h"
-#include          "werd.h"
-
 #define FIRST_COLOUR    ScrollView::RED      //< first rainbow colour
 
 /// last rainbow colour

ccutil/tprintf.cpp

@@ -19,11 +19,6 @@
 
 #include          "mfcpch.h"     //precompiled headers
 
-// Include automatically generated configuration file if running autoconf.
-#ifdef HAVE_CONFIG_H
-#include "config_auto.h"
-#endif
-
 #include          <stdio.h>
 #include          <stdarg.h>
 #include          "strngs.h"
@@ -33,6 +28,11 @@
 #include          "tprintf.h"
 #include          "ccutil.h"
 
+// Include automatically generated configuration file if running autoconf.
+#ifdef HAVE_CONFIG_H
+#include "config_auto.h"
+#endif
+
 #define MAX_MSG_LEN     1024
 
 #define EXTERN

classify/adaptmatch.cpp

@@ -19,11 +19,6 @@
 /*-----------------------------------------------------------------------------
           Include Files and Type Defines
 -----------------------------------------------------------------------------*/
-// Include automatically generated configuration file if running autoconf.
-#ifdef HAVE_CONFIG_H
-#include "config_auto.h"
-#endif
-
 #include <ctype.h>
 #include "adaptmatch.h"
 #include "normfeat.h"
@@ -58,6 +53,11 @@
 #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

classify/intmatcher.cpp

@@ -16,14 +16,9 @@
  ** See the License for the specific language governing permissions and
  ** limitations under the License.
  ******************************************************************************/
-/**----------------------------------------------------------------------------
+/*----------------------------------------------------------------------------
                           Include Files and Type Defines
-----------------------------------------------------------------------------**/
+----------------------------------------------------------------------------*/
-// Include automatically generated configuration file if running autoconf.
-#ifdef HAVE_CONFIG_H
-#include "config_auto.h"
-#endif
-
 #include "intmatcher.h"
 #include "intproto.h"
 #include "tordvars.h"
@@ -33,12 +28,17 @@
 #include "classify.h"
 #include <math.h>
 
+// Include automatically generated configuration file if running autoconf.
+#ifdef HAVE_CONFIG_H
+#include "config_auto.h"
+#endif
+
 #define CLASS_MASK_SIZE ((MAX_NUM_CLASSES*NUM_BITS_PER_CLASS \
 		+BITS_PER_WERD-1)/BITS_PER_WERD)
 
-/**----------------------------------------------------------------------------
+/*----------------------------------------------------------------------------
                     Global Data Definitions and Declarations
-----------------------------------------------------------------------------**/
+----------------------------------------------------------------------------*/
 #define  SE_TABLE_BITS    9
 #define  SE_TABLE_SIZE  512
 #define TEMPLATE_CACHE 2
@@ -153,9 +153,9 @@ int set_proto_bits;
 int config_shifts;
 int set_config_bits;
 
-/**----------------------------------------------------------------------------
+/*----------------------------------------------------------------------------
               Public Code
-----------------------------------------------------------------------------**/
+----------------------------------------------------------------------------*/
 /*---------------------------------------------------------------------------*/
 namespace tesseract {
 int Classify::ClassPruner(INT_TEMPLATES IntTemplates,

classify/intproto.cpp

@@ -18,11 +18,6 @@
 /*-----------------------------------------------------------------------------
           Include Files and Type Defines
 -----------------------------------------------------------------------------*/
-// Include automatically generated configuration file if running autoconf.
-#ifdef HAVE_CONFIG_H
-#include "config_auto.h"
-#endif
-
 #include "helpers.h"
 #include "intproto.h"
 #include "picofeat.h"
@@ -45,6 +40,11 @@
 #include <unistd.h>
 #endif
 
+// Include automatically generated configuration file if running autoconf.
+#ifdef HAVE_CONFIG_H
+#include "config_auto.h"
+#endif
+
 /* match debug display constants*/
 #define DISPLAY_OFFSET  (0.5  * INT_CHAR_NORM_RANGE)
 #define PROTO_PRUNER_SCALE  (4.0)

classify/mfoutline.cpp

@@ -15,9 +15,9 @@
  ** See the License for the specific language governing permissions and
  ** limitations under the License.
  ******************************************************************************/
-/**----------------------------------------------------------------------------
+/*----------------------------------------------------------------------------
           Include Files and Type Defines
-----------------------------------------------------------------------------**/
+----------------------------------------------------------------------------*/
 #include "clusttool.h"           //If remove you get cought in a loop somewhere
 #include "emalloc.h"
 #include "mfoutline.h"
@@ -32,16 +32,16 @@
 
 #define MIN_INERTIA (0.00001)
 
-/**----------------------------------------------------------------------------
+/*---------------------------------------------------------------------------
         Global Data Definitions and Declarations
-----------------------------------------------------------------------------**/
+----------------------------------------------------------------------------*/
 /* center of current blob being processed - used when "unexpanding"
   expanded blobs */
 static TPOINT BlobCenter;
 
-/**----------------------------------------------------------------------------
+/*----------------------------------------------------------------------------
              Variables
-----------------------------------------------------------------------------**/
+----------------------------------------------------------------------------*/
 
 /* control knobs used to control normalization of outlines */
 INT_VAR(classify_norm_method, character, "Normalization Method   ...");
@@ -55,9 +55,9 @@ double_VAR(classify_min_norm_scale_y, 0.0, "Min char y-norm scale ...");
 /* PREV DEFAULT 0.1 */
 double_VAR(classify_max_norm_scale_y, 0.325, "Max char y-norm scale ...");
 /* PREV DEFAULT 0.3 */
-/**----------------------------------------------------------------------------
+/*----------------------------------------------------------------------------
               Public Code
-----------------------------------------------------------------------------**/
+----------------------------------------------------------------------------*/
 /*---------------------------------------------------------------------------*/
 void ComputeBlobCenter(TBLOB *Blob, TPOINT *BlobCenter) {
 /*

config/config.h.in

@@ -12,9 +12,6 @@
 /* Disable graphics */
 #undef DISABLE_GRAPHICS
 
-/* Disable NLS */
-#undef DISABLE_NLS
-
 /* Define to 1 if translation of program messages to the user's native
    language is requested. */
 #undef ENABLE_NLS
@@ -167,6 +164,9 @@
    */
 #undef LT_OBJDIR
 
+/* Disable NLS */
+#undef NO_GETTEXT
+
 /* Name of package */
 #undef PACKAGE
 
@@ -239,8 +239,8 @@
 #define GRAPHICS_DISABLED
 #endif
 
-#ifndef DISABLE_NLS
+#ifndef NO_GETTEXT
-#define USE_NLS
+#define USING_GETTEXT
 #endif
 
 /* config_auto.h: end */

configure

@@ -813,6 +813,8 @@ LIBTOOL
 ac_ct_CXX
 CXXFLAGS
 CXX
+USING_GETTEXT_FALSE
+USING_GETTEXT_TRUE
 POSUB
 LTLIBINTL
 LIBINTL
@@ -2806,7 +2808,7 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
 # documentation.
 # TODO(luc) Generate good documentation using doxygen or equivalent
 PACKAGE_YEAR=2010
-PACKAGE_DATE="05/29"
+PACKAGE_DATE="09/30"
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2908,11 +2910,7 @@ fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_nls" >&5
 $as_echo "$enable_nls" >&6; }
-if test "$enable_nls" = "no"; then
+if test "$enable_nls" = "yes"; then
-
-$as_echo "#define DISABLE_NLS /**/" >>confdefs.h
-
-else
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
 $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
@@ -5782,7 +5780,19 @@ $as_echo "#define HAVE_DCGETTEXT 1" >>confdefs.h
 
 
 
+else
+
+$as_echo "#define NO_GETTEXT /**/" >>confdefs.h
+
 fi
+ if test "$enable_nls" = "yes"; then
+  USING_GETTEXT_TRUE=
+  USING_GETTEXT_FALSE='#'
+else
+  USING_GETTEXT_TRUE='#'
+  USING_GETTEXT_FALSE=
+fi
+
 
 # Always look into a "gnu" directory.
 curwd=`pwd`
@@ -6682,13 +6692,13 @@ if test "${lt_cv_nm_interface+set}" = set; then :
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:6685: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:6695: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:6688: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:6698: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:6691: output\"" >&5)
+  (eval echo "\"\$as_me:6701: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -7893,7 +7903,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 7896 "configure"' > conftest.$ac_ext
+  echo '#line 7906 "configure"' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -9819,11 +9829,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9822: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9832: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:9826: \$? = $ac_status" >&5
+   echo "$as_me:9836: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -10158,11 +10168,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:10161: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10171: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:10165: \$? = $ac_status" >&5
+   echo "$as_me:10175: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -10263,11 +10273,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:10266: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10276: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:10270: \$? = $ac_status" >&5
+   echo "$as_me:10280: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -10318,11 +10328,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:10321: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10331: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:10325: \$? = $ac_status" >&5
+   echo "$as_me:10335: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -12702,7 +12712,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12705 "configure"
+#line 12715 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12798,7 +12808,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12801 "configure"
+#line 12811 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -14754,11 +14764,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14757: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14767: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:14761: \$? = $ac_status" >&5
+   echo "$as_me:14771: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -14853,11 +14863,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14856: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14866: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:14860: \$? = $ac_status" >&5
+   echo "$as_me:14870: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -14905,11 +14915,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14908: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14918: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:14912: \$? = $ac_status" >&5
+   echo "$as_me:14922: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -18438,8 +18448,12 @@ fi
 # AC_DEFINE_UNQUOTED(TESSERACT_VERSION,["${PACKAGE_VERSION}"],[version string])
 
 # Output files
-ac_config_files="$ac_config_files Makefile po/Makefile.in"
+ac_config_files="$ac_config_files Makefile"
 
+if test "$enable_nls" = "yes"; then
+ac_config_files="$ac_config_files po/Makefile.in"
+
+fi
 ac_config_files="$ac_config_files api/Makefile"
 
 ac_config_files="$ac_config_files ccmain/Makefile"
@@ -18589,6 +18603,10 @@ LIBOBJS=$ac_libobjs
 LTLIBOBJS=$ac_ltlibobjs
 
 
+if test -z "${USING_GETTEXT_TRUE}" && test -z "${USING_GETTEXT_FALSE}"; then
+  as_fn_error "conditional \"USING_GETTEXT\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
   as_fn_error "conditional \"AMDEP\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5

configure.ac

@@ -19,7 +19,7 @@ AC_CANONICAL_HOST
 # documentation.
 # TODO(luc) Generate good documentation using doxygen or equivalent
 PACKAGE_YEAR=2010
-PACKAGE_DATE="05/29"
+PACKAGE_DATE="09/30"
 
 AC_DEFINE_UNQUOTED(PACKAGE_NAME,["${PACKAGE_NAME}"],[Name of package])
 AC_DEFINE_UNQUOTED(PACKAGE_VERSION,["${PACKAGE_VERSION}"],[Version number])
@@ -90,13 +90,14 @@ AC_ARG_ENABLE([nls],
     [enable_nls=$enableval],
     [enable_nls="yes"])
 AC_MSG_RESULT($enable_nls)
-if test "$enable_nls" = "no"; then
+if test "$enable_nls" = "yes"; then
-  AC_DEFINE([DISABLE_NLS], [], [Disable NLS])
-else
   AM_GNU_GETTEXT_VERSION([0.17])
   AM_GNU_GETTEXT([external])  
   AC_SUBST(localedir)
+else
+  AC_DEFINE([NO_GETTEXT], [], [Disable NLS])
 fi
+AM_CONDITIONAL([USING_GETTEXT], [test "$enable_nls" = "yes"])
 
 # Always look into a "gnu" directory.
 curwd=`pwd`
@@ -352,7 +353,10 @@ fi
 # AC_DEFINE_UNQUOTED(TESSERACT_VERSION,["${PACKAGE_VERSION}"],[version string])
 
 # Output files
-AC_CONFIG_FILES(Makefile po/Makefile.in)
+AC_CONFIG_FILES(Makefile)
+if test "$enable_nls" = "yes"; then
+AC_CONFIG_FILES(po/Makefile.in)
+fi
 AC_CONFIG_FILES(api/Makefile)
 AC_CONFIG_FILES(ccmain/Makefile)
 AC_CONFIG_FILES(ccstruct/Makefile)
@@ -415,8 +419,8 @@ AH_BOTTOM([
 #define GRAPHICS_DISABLED
 #endif
 
-#ifndef DISABLE_NLS
+#ifndef NO_GETTEXT
-#define USE_NLS
+#define USING_GETTEXT
 #endif
 
 /* config_auto.h: end */

image/imgtiff.cpp

@@ -33,7 +33,7 @@
 #define __MOTO__  // Big-endian.
 #endif
 #endif
-#ifdef USE_NLS
+#ifdef USING_GETTEXT
 #include <libintl.h>
 #include <locale.h>
 #define _(x) gettext(x)

textord/alignedblob.cpp

@@ -17,14 +17,14 @@
 //
 ///////////////////////////////////////////////////////////////////////
 
+#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/colfind.cpp

@@ -18,11 +18,6 @@
 //
 ///////////////////////////////////////////////////////////////////////
 
-// Include automatically generated configuration file if running autoconf.
-#ifdef HAVE_CONFIG_H
-#include "config_auto.h"
-#endif
-
 #ifdef _MSC_VER
 #pragma warning(disable:4244)  // Conversion warnings
 #endif
@@ -38,6 +33,11 @@
 #include "varable.h"
 #include "workingpartset.h"
 
+// Include automatically generated configuration file if running autoconf.
+#ifdef HAVE_CONFIG_H
+#include "config_auto.h"
+#endif
+
 namespace tesseract {
 
 // Minimum width to be considered when making columns.

textord/drawedg.cpp

@@ -17,14 +17,14 @@
  *
  **********************************************************************/
 
+#include "mfcpch.h"
+#include          "drawedg.h"
+
 // Include automatically generated configuration file if running autoconf.
 #ifdef HAVE_CONFIG_H
 #include "config_auto.h"
 #endif
 
-#include "mfcpch.h"
-#include          "drawedg.h"
-
 #ifndef GRAPHICS_DISABLED
 
 /** title of window */

textord/drawtord.cpp

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

textord/edgblob.cpp

@@ -17,17 +17,17 @@
  *
  **********************************************************************/
 
-// Include automatically generated configuration file if running autoconf.
-#ifdef HAVE_CONFIG_H
-#include "config_auto.h"
-#endif
-
 #include "mfcpch.h"
 #include "scanedg.h"
 #include "drawedg.h"
 #include "edgloop.h"
 #include "edgblob.h"
 
+// Include automatically generated configuration file if running autoconf.
+#ifdef HAVE_CONFIG_H
+#include "config_auto.h"
+#endif
+
 #define EXTERN
 
 // Control parameters used in outline_complexity(), which rejects an outline

textord/edgloop.cpp

@@ -17,16 +17,16 @@
  *
  **********************************************************************/
 
-// Include automatically generated configuration file if running autoconf.
-#ifdef HAVE_CONFIG_H
-#include "config_auto.h"
-#endif
-
 #include "mfcpch.h"
 #include          "scanedg.h"
 #include          "drawedg.h"
 #include          "edgloop.h"
 
+// Include automatically generated configuration file if running autoconf.
+#ifdef HAVE_CONFIG_H
+#include "config_auto.h"
+#endif
+
 #define MINEDGELENGTH   8        //min decent length
 
 #define EXTERN

textord/fpchop.cpp

@@ -17,11 +17,6 @@
  *
  **********************************************************************/
 
-// Include automatically generated configuration file if running autoconf.
-#ifdef HAVE_CONFIG_H
-#include "config_auto.h"
-#endif
-
 #include "mfcpch.h"
 #ifdef __UNIX__
 #include          <assert.h>
@@ -36,6 +31,11 @@
 #include          "fpchop.h"
 #include          "notdll.h"
 
+// Include automatically generated configuration file if running autoconf.
+#ifdef HAVE_CONFIG_H
+#include "config_auto.h"
+#endif
+
 #define EXTERN
 
 EXTERN INT_VAR (textord_fp_chop_error, 2,

textord/makerow.cpp

@@ -17,11 +17,6 @@
  *
  **********************************************************************/
 
-// Include automatically generated configuration file if running autoconf.
-#ifdef HAVE_CONFIG_H
-#include "config_auto.h"
-#endif
-
 #include "mfcpch.h"
 #ifdef __UNIX__
 #include          <assert.h>
@@ -41,6 +36,11 @@
 #include          "tesseractclass.h"
 #include          "tovars.h"
 
+// Include automatically generated configuration file if running autoconf.
+#ifdef HAVE_CONFIG_H
+#include "config_auto.h"
+#endif
+
 BOOL_VAR(textord_heavy_nr, FALSE, "Vigorously remove noise");
 BOOL_VAR(textord_show_initial_rows, FALSE, "Display row accumulation");
 BOOL_VAR(textord_show_parallel_rows, FALSE, "Display page correlated rows");

textord/oldbasel.cpp

@@ -17,11 +17,6 @@
  *
  **********************************************************************/
 
-// Include automatically generated configuration file if running autoconf.
-#ifdef HAVE_CONFIG_H
-#include "config_auto.h"
-#endif
-
 #include "mfcpch.h"
 #include          "statistc.h"
 #include          "quadlsq.h"
@@ -32,6 +27,11 @@
 #include          "tprintf.h"
 #include          "tesseractclass.h"
 
+// Include automatically generated configuration file if running autoconf.
+#ifdef HAVE_CONFIG_H
+#include "config_auto.h"
+#endif
+
 #define EXTERN
 
 EXTERN BOOL_VAR (textord_really_old_xheight, FALSE,

textord/strokewidth.cpp

@@ -17,11 +17,6 @@
 //
 ///////////////////////////////////////////////////////////////////////
 
-// Include automatically generated configuration file if running autoconf.
-#ifdef HAVE_CONFIG_H
-#include "config_auto.h"
-#endif
-
 #ifdef _MSC_VER
 #pragma warning(disable:4244)  // Conversion warnings
 #endif
@@ -31,6 +26,11 @@
 #include "tabfind.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 {
 
 /** Allowed proportional change in stroke width to be the same font. */

textord/tabfind.cpp

@@ -17,11 +17,6 @@
 //
 ///////////////////////////////////////////////////////////////////////
 
-// Include automatically generated configuration file if running autoconf.
-#ifdef HAVE_CONFIG_H
-#include "config_auto.h"
-#endif
-
 #include "tabfind.h"
 #include "alignedblob.h"
 #include "blobbox.h"
@@ -29,6 +24,11 @@
 #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/tabvector.cpp

@@ -17,11 +17,6 @@
 //
 ///////////////////////////////////////////////////////////////////////
 
-// Include automatically generated configuration file if running autoconf.
-#ifdef HAVE_CONFIG_H
-#include "config_auto.h"
-#endif
-
 #ifdef _MSC_VER
 #pragma warning(disable:4244)  // Conversion warnings
 #endif
@@ -32,6 +27,11 @@
 #include "colpartitionset.h"
 #include "detlinefit.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/topitch.cpp

@@ -17,11 +17,6 @@
  *
  **********************************************************************/
 
-// Include automatically generated configuration file if running autoconf.
-#ifdef HAVE_CONFIG_H
-#include "config_auto.h"
-#endif
-
 #include "mfcpch.h"
 #ifdef __UNIX__
 #include          <assert.h>
@@ -41,6 +36,11 @@
 #include          "secname.h"
 #include          "tesseractclass.h"
 
+// Include automatically generated configuration file if running autoconf.
+#ifdef HAVE_CONFIG_H
+#include "config_auto.h"
+#endif
+
 #define EXTERN
 
 EXTERN BOOL_VAR (textord_all_prop, FALSE, "All doc is proportial text");

textord/tordmain.cpp

@@ -16,11 +16,6 @@
  ** limitations under the License.
  *
  **********************************************************************/
-// Include automatically generated configuration file if running autoconf.
-#ifdef HAVE_CONFIG_H
-#include "config_auto.h"
-#endif
-
 #include "mfcpch.h"
 #ifdef __UNIX__
 #include <assert.h>
@@ -41,6 +36,11 @@
 #include "secname.h"
 #include "tesseractclass.h"
 
+// Include automatically generated configuration file if running autoconf.
+#ifdef HAVE_CONFIG_H
+#include "config_auto.h"
+#endif
+
 // Some of the code in this file is dependent upon leptonica. If you don't
 // have it, you don't get this functionality.
 #ifdef HAVE_CONFIG_H

textord/tospace.cpp

@@ -1,8 +1,3 @@
-// Include automatically generated configuration file if running autoconf.
-#ifdef HAVE_CONFIG_H
-#include "config_auto.h"
-#endif
-
 #include "mfcpch.h"
 #include "tovars.h"
 #include "drawtord.h"
@@ -10,6 +5,11 @@
 #include "ndminx.h"
 #include "statistc.h"
 
+// Include automatically generated configuration file if running autoconf.
+#ifdef HAVE_CONFIG_H
+#include "config_auto.h"
+#endif
+
 BOOL_VAR(tosp_old_to_method, FALSE, "Space stats use prechopping?");
 BOOL_VAR(tosp_only_use_prop_rows, TRUE,
 "Block stats to use fixed pitch rows?");

textord/wordseg.cpp

@@ -17,11 +17,6 @@
  *
  **********************************************************************/
 
-// Include automatically generated configuration file if running autoconf.
-#ifdef HAVE_CONFIG_H
-#include "config_auto.h"
-#endif
-
 #include "mfcpch.h"
 #ifdef __UNIX__
 #include          <assert.h>
@@ -41,6 +36,11 @@
 #include          "fpchop.h"
 #include          "wordseg.h"
 
+// Include automatically generated configuration file if running autoconf.
+#ifdef HAVE_CONFIG_H
+#include "config_auto.h"
+#endif
+
 #define EXTERN
 
 EXTERN BOOL_VAR (textord_fp_chopping, TRUE, "Do fixed pitch chopping");

viewer/scrollview.cpp

@@ -18,6 +18,17 @@
 ///////////////////////////////////////////////////////////////////////
 //
 
+#include <stdarg.h>
+#include <limits.h>
+#include <string.h>
+#include <map>
+#include <utility>
+#include <algorithm>
+#include <vector>
+#include <string>
+#include <cstring>
+#include <climits>
+
 // Include automatically generated configuration file if running autoconf.
 #ifdef HAVE_CONFIG_H
 #include "config_auto.h"
@@ -36,22 +47,8 @@ const int kSvPort = 8461;
 const int kMaxMsgSize = 4096;
 const int kMaxIntPairSize = 45;  // Holds %d,%d, for upto 64 bit.
 
-#ifdef HAVE_CONFIG_H
-#include "config_auto.h"
-#endif
 #include "scrollview.h"
 
-#include <stdarg.h>
-#include <limits.h>
-#include <string.h>
-#include <map>
-#include <utility>
-#include <algorithm>
-#include <vector>
-#include <string>
-#include <cstring>
-#include <climits>
-
 #include "svutil.h"
 
 #ifdef HAVE_LIBLEPT

viewer/svmnode.cpp

@@ -25,19 +25,19 @@
 // A SVMenuNode can both be used in the context_ of popup menus as well as
 // menu bars.
 
+#include <string.h>
+#include <iostream>
+#include <cstring>
+
+#include "svmnode.h"
+
 // Include automatically generated configuration file if running autoconf.
 #ifdef HAVE_CONFIG_H
 #include "config_auto.h"
 #endif
 
-#include "svmnode.h"
-
 #ifndef GRAPHICS_DISABLED
 
-#include <string.h>
-#include <iostream>
-#include <cstring>
-
 #include "scrollview.h"
 
 // Create the empty root menu node. with just a caption. All other nodes should

viewer/svutil.cpp

@@ -20,15 +20,6 @@
 // SVUtil contains the SVSync and SVNetwork classes, which are used for
 // thread/process creation & synchronization and network connection.
 
-// Include automatically generated configuration file if running autoconf.
-#ifdef HAVE_CONFIG_H
-#include "config_auto.h"
-#endif
-
-#ifndef GRAPHICS_DISABLED
-
-#include "svutil.h"
-
 #include <stdio.h>
 #ifdef WIN32
 #include <windows.h>
@@ -60,6 +51,15 @@ struct addrinfo {
 #include <iostream>
 #include <string>
 
+// Include automatically generated configuration file if running autoconf.
+#ifdef HAVE_CONFIG_H
+#include "config_auto.h"
+#endif
+
+#ifndef GRAPHICS_DISABLED
+
+#include "svutil.h"
+
 const int kBufferSize = 65536;
 const int kMaxMsgSize = 4096;
 

wordrec/bestfirst.cpp

@@ -27,11 +27,6 @@
           I n c l u d e s
 ---------------------------------------------------------------------*/
 
-// Include automatically generated configuration file if running autoconf.
-#ifdef HAVE_CONFIG_H
-#include "config_auto.h"
-#endif
-
 #include <assert.h>
 
 #include "bestfirst.h"
@@ -55,6 +50,11 @@
 #include "wordclass.h"
 #include "wordrec.h"
 
+// Include automatically generated configuration file if running autoconf.
+#ifdef HAVE_CONFIG_H
+#include "config_auto.h"
+#endif
+
 void call_caller();
 
 /*----------------------------------------------------------------------

wordrec/chop.cpp

@@ -27,11 +27,6 @@
               I n c l u d e s
 ----------------------------------------------------------------------*/
 
-// Include automatically generated configuration file if running autoconf.
-#ifdef HAVE_CONFIG_H
-#include "config_auto.h"
-#endif
-
 #include "chop.h"
 #include "outlines.h"
 #include "olutil.h"
@@ -42,6 +37,11 @@
 
 #include <math.h>
 
+// Include automatically generated configuration file if running autoconf.
+#ifdef HAVE_CONFIG_H
+#include "config_auto.h"
+#endif
+
 /*----------------------------------------------------------------------
               V a r i a b l e s
 ----------------------------------------------------------------------*/

wordrec/chopper.cpp

@@ -27,11 +27,6 @@
           I n c l u d e s
 ----------------------------------------------------------------------*/
 
-// Include automatically generated configuration file if running autoconf.
-#ifdef HAVE_CONFIG_H
-#include "config_auto.h"
-#endif
-
 #include <math.h>
 
 #include "chopper.h"
@@ -57,6 +52,11 @@
 #include "wordclass.h"
 #include "wordrec.h"
 
+// Include automatically generated configuration file if running autoconf.
+#ifdef HAVE_CONFIG_H
+#include "config_auto.h"
+#endif
+
 INT_VAR (repair_unchopped_blobs, 1, "Fix blobs that aren't chopped");
 
 //?extern int tessedit_dangambigs_chop;

wordrec/drawfx.cpp

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

wordrec/findseam.cpp

@@ -25,11 +25,6 @@
 /*----------------------------------------------------------------------
               I n c l u d e s
 ----------------------------------------------------------------------*/
-// Include automatically generated configuration file if running autoconf.
-#ifdef HAVE_CONFIG_H
-#include "config_auto.h"
-#endif
-
 #include "findseam.h"
 #include "gradechop.h"
 #include "olutil.h"
@@ -38,6 +33,11 @@
 #include "freelist.h"
 #include "seam.h"
 
+// Include automatically generated configuration file if running autoconf.
+#ifdef HAVE_CONFIG_H
+#include "config_auto.h"
+#endif
+
 /*----------------------------------------------------------------------
               T y p e s
 ----------------------------------------------------------------------*/

wordrec/makechop.cpp

@@ -26,11 +26,6 @@
       I n c l u d e s
 ----------------------------------------------------------------------*/
 
-// Include automatically generated configuration file if running autoconf.
-#ifdef HAVE_CONFIG_H
-#include "config_auto.h"
-#endif
-
 #include "makechop.h"
 #include "render.h"
 #include "structures.h"
@@ -39,6 +34,11 @@
 #include <unistd.h>
 #endif
 
+// Include automatically generated configuration file if running autoconf.
+#ifdef HAVE_CONFIG_H
+#include "config_auto.h"
+#endif
+
 /*----------------------------------------------------------------------
         Public Function Code
 ----------------------------------------------------------------------*/

wordrec/metrics.cpp

@@ -25,11 +25,6 @@
 /*----------------------------------------------------------------------
               I n c l u d e s
 ----------------------------------------------------------------------*/
-// Include automatically generated configuration file if running autoconf.
-#ifdef HAVE_CONFIG_H
-#include "config_auto.h"
-#endif
-
 #include "metrics.h"
 #include "bestfirst.h"
 #include "associate.h"
@@ -43,6 +38,11 @@
 #include "ndminx.h"
 #include "wordrec.h"
 
+// Include automatically generated configuration file if running autoconf.
+#ifdef HAVE_CONFIG_H
+#include "config_auto.h"
+#endif
+
 /*----------------------------------------------------------------------
               V a r i a b l e s
 ----------------------------------------------------------------------*/

wordrec/pieces.cpp

@@ -25,11 +25,6 @@
 /*----------------------------------------------------------------------
           I n c l u d e s
 ----------------------------------------------------------------------*/
-// Include automatically generated configuration file if running autoconf.
-#ifdef HAVE_CONFIG_H
-#include "config_auto.h"
-#endif
-
 #include "pieces.h"
 
 #include "blobs.h"
@@ -42,6 +37,11 @@
 #include "wordclass.h"
 #include "wordrec.h"
 
+// Include automatically generated configuration file if running autoconf.
+#ifdef HAVE_CONFIG_H
+#include "config_auto.h"
+#endif
+
 /*----------------------------------------------------------------------
           M a c r o s
 ----------------------------------------------------------------------*/

wordrec/plotedges.cpp

@@ -22,11 +22,6 @@
  ** limitations under the License.
  *
  *********************************************************************************/
-// Include automatically generated configuration file if running autoconf.
-#ifdef HAVE_CONFIG_H
-#include "config_auto.h"
-#endif
-
 #ifdef __UNIX__
 #include <assert.h>
 #endif
@@ -35,6 +30,11 @@
 #include "render.h"
 #include "split.h"
 
+// Include automatically generated configuration file if running autoconf.
+#ifdef HAVE_CONFIG_H
+#include "config_auto.h"
+#endif
+
 #ifndef GRAPHICS_DISABLED
 
 /*----------------------------------------------------------------------

wordrec/plotseg.cpp

@@ -25,11 +25,6 @@
 /*----------------------------------------------------------------------
               I n c l u d e s
 ----------------------------------------------------------------------*/
-// Include automatically generated configuration file if running autoconf.
-#ifdef HAVE_CONFIG_H
-#include "config_auto.h"
-#endif
-
 #include "plotseg.h"
 #include "callcpp.h"
 #include "scrollview.h"
@@ -38,6 +33,11 @@
 #include "const.h"
 #include <math.h>
 
+// Include automatically generated configuration file if running autoconf.
+#ifdef HAVE_CONFIG_H
+#include "config_auto.h"
+#endif
+
 #ifndef GRAPHICS_DISABLED
 
 /*----------------------------------------------------------------------

wordrec/render.cpp

@@ -22,11 +22,6 @@
  ** limitations under the License.
  *
  *********************************************************************************/
-// Include automatically generated configuration file if running autoconf.
-#ifdef HAVE_CONFIG_H
-#include "config_auto.h"
-#endif
-
 #include "render.h"
 #include "blobs.h"
 
@@ -37,6 +32,11 @@
 
 #include "vecfuncs.h"
 
+// Include automatically generated configuration file if running autoconf.
+#ifdef HAVE_CONFIG_H
+#include "config_auto.h"
+#endif
+
 /*----------------------------------------------------------------------
               V a r i a b l e s
 ----------------------------------------------------------------------*/

wordrec/wordclass.cpp

@@ -25,11 +25,6 @@
 /*----------------------------------------------------------------------
           I N C L U D E S
 ----------------------------------------------------------------------*/
-// Include automatically generated configuration file if running autoconf.
-#ifdef HAVE_CONFIG_H
-#include "config_auto.h"
-#endif
-
 #include <stdio.h>
 #ifdef __UNIX__
 #include <assert.h>
@@ -50,6 +45,11 @@
 #include <assert.h>
 #include "wordrec.h"
 
+// Include automatically generated configuration file if running autoconf.
+#ifdef HAVE_CONFIG_H
+#include "config_auto.h"
+#endif
+
 extern TBLOB *newblob();
 
 /*----------------------------------------------------------------------