Misc improvements

git-svn-id: https://tesseract-ocr.googlecode.com/svn/trunk@132 d0cd1f9f-072b-0410-8dd7-cf729c803f20
lzpfmh · Feb 1, 2008 · aa55810 · aa55810
1 parent 830a2f5
commit aa55810
Show file tree

Hide file tree

Showing 17 changed files with 1,172 additions and 240 deletions.
diff --git a/ccutil/mainblk.cpp b/ccutil/mainblk.cpp
@@ -40,7 +40,7 @@ EXTERN DLLSYM STRING imagebasename;
 EXTERN BOOL_VAR (m_print_variables, FALSE,
 "Print initial values of all variables");
 EXTERN STRING_VAR (m_data_sub_dir, "tessdata/", "Directory for data files");
-EXTERN INT_VAR (memgrab_size, 13000000, "Preallocation size for batch use");
+EXTERN INT_VAR (memgrab_size, 0, "Preallocation size for batch use");
 const ERRCODE NO_PATH =
 "Warning:explicit path for executable will not be used for configs";
 static const ERRCODE USAGE = "Usage";

diff --git a/ccutil/ndminx.h b/ccutil/ndminx.h
@@ -20,6 +20,12 @@
 #ifndef           NDMINX_H
 #define           NDMINX_H
 
-#define MAX(a,b)        ( (a>b) ? a : b )
-#define MIN(a,b)        ( (a<b) ? a : b )
+#ifndef MAX
+  #define MAX(a,b)        ( (a>b) ? a : b )
+#endif
+
+#ifndef MIN
+  #define MIN(a,b)        ( (a<b) ? a : b )
+#endif
+
 #endif