Update to 2.0.0 tree from current Fremantle build

[opencv] / debian / patches / 110_backport_r2255.diff

diff --git a/debian/patches/110_backport_r2255.diff b/debian/patches/110_backport_r2255.diff
new file mode 100644 (file)
index 0000000..8e1c304
--- /dev/null
+++ b/debian/patches/110_backport_r2255.diff
@@ -0,0 +1,12 @@
+--- a/include/opencv/cxcore.hpp        2009-12-28 16:18:41.000000000 +0900
++++ b/include/opencv/cxcore.hpp        2009-12-28 16:19:11.000000000 +0900
+@@ -60,7 +60,8 @@
+ namespace cv {
+ 
+ #undef min
+-#undef max    
++#undef max
++#undef Complex   
+ 
+ using std::vector;
+ using std::string;