fixed hundreds of warnings from MSVC 2010.

2012-03-16 21:21:04 +00:00
parent 20cceb8fdf
commit 4985c1b632
83 changed files with 317 additions and 306 deletions
--- a/modules/highgui/src/cap.cpp
+++ b/modules/highgui/src/cap.cpp
@@ -47,6 +47,7 @@

 #if defined _M_X64 && defined _MSC_VER && !defined CV_ICC
 #pragma optimize("",off)
+#pragma warning( disable: 4748 )
 #endif

 namespace cv
--- a/modules/highgui/src/cap_vfw.cpp
+++ b/modules/highgui/src/cap_vfw.cpp
@@ -54,6 +54,7 @@

 #if defined _M_X64
 #pragma optimize("",off)
+#pragma warning(disable: 4748)
 #endif

 /********************* Capturing video from AVI via VFW ************************/
--- a/modules/highgui/src/grfmt_jpeg.cpp
+++ b/modules/highgui/src/grfmt_jpeg.cpp
@@ -44,6 +44,10 @@

 #ifdef HAVE_JPEG

+#ifdef _MSC_VER
+#pragma warning(disable: 4324 4611)
+#endif
+
 #include <stdio.h>
 #include <setjmp.h>