From: Vadim Pisarevsky <vadim.pisarevsky@itseez.com>
Date: Tue, 9 Oct 2012 12:02:06 +0000 (+0400)
Subject: added #undef True/False to avoid collision with X11 (Patch #1562)
X-Git-Tag: accepted/2.0/20130307.220821~364^2~91
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d54f4e1cfb1ead6d9f41e1b8adf58049ea9b5c3f;p=profile%2Fivi%2Fopencv.git

added #undef True/False to avoid collision with X11 (Patch #1562)
---

diff --git a/modules/flann/include/opencv2/flann/dist.h b/modules/flann/include/opencv2/flann/dist.h
index ceb8354..ab78b25 100644
--- a/modules/flann/include/opencv2/flann/dist.h
+++ b/modules/flann/include/opencv2/flann/dist.h
@@ -77,6 +77,8 @@ struct Accumulator<short>  { typedef float Type; };
 template<>
 struct Accumulator<int> { typedef float Type; };
 
+#undef True
+#undef False
 
 class True
 {