Merge pull request #278 from taka-no-me:fix_build_jpeg9

e34aba60 · Andrey Kamaev · OpenCV Buildbot · 873aefae · 4e1ba6f0 · e34aba60
Commit e34aba60 authored Jan 09, 2013 by Andrey Kamaev Committed by OpenCV Buildbot Jan 09, 2013
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

grfmt_jpeg.cpp modules/highgui/src/grfmt_jpeg.cpp +3 -0

No files found.
--- 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"
 }