projects
/
profile
/
ivi
/
opencv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
47df8f4
)
Fix build with libjpeg release 9
author
Andrey Kamaev
<andrey.kamaev@itseez.com>
Mon, 31 Dec 2012 00:17:36 +0000
(
04:17
+0400)
committer
Andrey Kamaev
<andrey.kamaev@itseez.com>
Tue, 8 Jan 2013 15:55:29 +0000
(19:55 +0400)
modules/highgui/src/grfmt_jpeg.cpp
patch
|
blob
|
history
diff --git
a/modules/highgui/src/grfmt_jpeg.cpp
b/modules/highgui/src/grfmt_jpeg.cpp
index
6ecf2d6
..
5215176
100644
(file)
--- 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"
}