Merge branch 2.4

2013-01-11 15:43:50 +04:00
parent 19229f2fa0 5e2726fb17
commit 084b1c7969
25 changed files with 556 additions and 359 deletions
--- a/modules/highgui/src/grfmt_jpeg.cpp
+++ b/modules/highgui/src/grfmt_jpeg.cpp
@@ -63,6 +63,9 @@
 typedef unsigned char boolean;
 #endif

+#undef FALSE
+#undef TRUE
+
 extern "C" {
 #include "jpeglib.h"
 }