Update to 2.0.0 tree from current Fremantle build

[opencv] / tests / cv / src / cvtest.h

diff --git a/tests/cv/src/cvtest.h b/tests/cv/src/cvtest.h
index 68f7034..4880ded 100644 (file)
--- a/tests/cv/src/cvtest.h
+++ b/tests/cv/src/cvtest.h
@@ -52,9 +52,12 @@
 #include "cxts.h"
 #include "highgui.h"
 
+#undef min
+#undef max
+
 void cvTsCalcSobelKernel2D( int dx, int dy, int _aperture_size, int origin, CvMat* kernel );
 int cvTsRodrigues( const CvMat* src, CvMat* dst, CvMat* jacobian=0 );
-void cvTsConvertHomogenious( const CvMat* src, CvMat* dst );
+void cvTsConvertHomogeneous( const CvMat* src, CvMat* dst );
 
 #endif /* _CVTEST_H_ */