silence more useless warnings

git-svn-id: https://tesseract-ocr.googlecode.com/svn/trunk@432 d0cd1f9f-072b-0410-8dd7-cf729c803f20
allen8807 · Jul 21, 2010 · edf7e76 · edf7e76
1 parent c2fd3fa
commit edf7e76
Show file tree

Hide file tree

Showing 10 changed files with 45 additions and 1 deletion.
diff --git a/ccmain/adaptions.cpp b/ccmain/adaptions.cpp
@@ -18,12 +18,13 @@
  *
  **********************************************************************/
 
+#include "mfcpch.h"
+
 // 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>
 #endif
@@ -45,6 +46,11 @@
 #include          "secname.h"
 #include          "tesseractclass.h"
 
+#ifdef _MSC_VER
+#pragma warning(disable:4244)  // Conversion warnings
+#pragma warning(disable:4305)  // int/float warnings
+#endif
+
 inT32 demo_word = 0;
 
 #define WINDOWNAMESIZE    13     /*max size of name */

diff --git a/ccmain/tstruct.cpp b/ccmain/tstruct.cpp
@@ -24,6 +24,10 @@
 #include          "ocrblock.h"
 //#include "structures.h"
 
+#ifdef _MSC_VER
+#pragma warning(disable:4244)  // Conversion warnings
+#endif
+
 static ERRCODE BADFRAGMENTS = "Couldn't find matching fragment ends";
 
 ELISTIZE (FRAGMENT)

diff --git a/dict/conversion.cpp b/dict/conversion.cpp
@@ -29,6 +29,11 @@
 #include "stopper.h"
 #include "unicharset.h"
 
+#ifdef _MSC_VER
+#pragma warning(disable:4244)  // Conversion warnings
+#pragma warning(disable:4018)  // signed/unsigned warnings
+#endif
+
 namespace tesseract {
 int Dict::valid_word(const char *string) {
   WERD_CHOICE word(string, getUnicharset());

diff --git a/dict/dawg.cpp b/dict/dawg.cpp
@@ -36,6 +36,11 @@
 #include "strngs.h"
 #include "tprintf.h"
 
+#ifdef _MSC_VER
+#pragma warning(disable:4244)  // Conversion warnings
+#pragma warning(disable:4800)  // int/bool warnings
+#endif
+
 /*----------------------------------------------------------------------
               V a r i a b l e s
 ----------------------------------------------------------------------*/

diff --git a/dict/dict.cpp b/dict/dict.cpp
@@ -18,6 +18,10 @@
 
 #include "dict.h"
 
+#ifdef _MSC_VER
+#pragma warning(disable:4244)  // Conversion warnings
+#endif
+
 namespace tesseract {
 
 class Image;

diff --git a/dict/permute.cpp b/dict/permute.cpp
@@ -55,6 +55,11 @@
 #include "image.h"
 #include "ccutil.h"
 
+#ifdef _MSC_VER
+#pragma warning(disable:4244)  // Conversion warnings
+#pragma warning(disable:4800)  // int/bool warnings
+#endif
+
 int permutation_count;           // Used in metrics.cpp.
 /*----------------------------------------------------------------------
               V a r i a b l e s

diff --git a/dict/stopper.cpp b/dict/stopper.cpp
@@ -45,6 +45,11 @@
 #include <assert.h>
 #endif
 
+#ifdef _MSC_VER
+#pragma warning(disable:4244)  // Conversion warnings
+#pragma warning(disable:4800)  // int/bool warnings
+#endif
+
 /* these are kludges - add appropriate .h file later */
 /* from adaptmatch.cpp */
 #define MAX_WERD_SIZE   100

diff --git a/dict/trie.cpp b/dict/trie.cpp
@@ -33,6 +33,11 @@
 #include "freelist.h"
 #include "helpers.h"
 
+#ifdef _MSC_VER
+#pragma warning(disable:4244)  // Conversion warnings
+#pragma warning(disable:4800)  // int/bool warnings
+#endif
+
 namespace tesseract {
 
 bool Trie::edge_char_of(NODE_REF node_ref, NODE_REF next_node,

diff --git a/dlltest/dlltest.vcproj b/dlltest/dlltest.vcproj
@@ -71,6 +71,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalOptions="/NODEFAULTLIB:library"
 				AdditionalDependencies="user32.lib ../tessdll.lib"
 				OutputFile=".\../dlltest.exe"
 				LinkIncremental="1"

diff --git a/image/imgbmp.cpp b/image/imgbmp.cpp
@@ -27,6 +27,10 @@
 #include          "img.h"
 #include          "imgbmp.h"
 
+#ifdef _MSC_VER
+#pragma warning(disable:4244)  // Conversion warnings
+#endif
+
 typedef struct
 {                                // bmfh
   char bfType1;                  //'B'