Update to 2.0.0 tree from current Fremantle build
[opencv] / debian / patches / 110_backport_r2255.diff
1 --- a/include/opencv/cxcore.hpp 2009-12-28 16:18:41.000000000 +0900
2 +++ b/include/opencv/cxcore.hpp 2009-12-28 16:19:11.000000000 +0900
3 @@ -60,7 +60,8 @@
4  namespace cv {
5  
6  #undef min
7 -#undef max    
8 +#undef max
9 +#undef Complex   
10  
11  using std::vector;
12  using std::string;