fixed 0.5.0 build for Windows

git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@358 620bd6b2-0a58-f614-fd9a-1bd335dccda9

include/find_object/QtOpenCV.h

@@ -11,15 +11,15 @@
 #include <opencv2/core/core.hpp>
 
 // Convert OpenCV matrix to QImage
-QImage FINDOBJECT_EXP cvtCvMat2QImage(const cv::Mat & image, bool isBgr = true);
+FINDOBJECT_EXP QImage cvtCvMat2QImage(const cv::Mat & image, bool isBgr = true);
 
 // Convert QImage to OpenCV matrix
-cv::Mat FINDOBJECT_EXP cvtQImage2CvMat(const QImage & image);
+FINDOBJECT_EXP cv::Mat cvtQImage2CvMat(const QImage & image);
 
 // Convert IplImage to QImage
-QImage FINDOBJECT_EXP cvtIplImage2QImage(const IplImage * image);
+FINDOBJECT_EXP QImage cvtIplImage2QImage(const IplImage * image);
 
 // Convert QImage to IplImage
-IplImage * FINDOBJECT_EXP cvtQImage2IplImage(const QImage & image);
+FINDOBJECT_EXP IplImage * cvtQImage2IplImage(const QImage & image);
 
 #endif // QTOPENCV_H

include/find_object/utilite/ULogger.h

@@ -32,6 +32,11 @@
 
 #include <stdarg.h>
 
+#if _MSC_VER
+	#undef min
+	#undef max
+#endif
+
 /**
  * \file ULogger.h
  * \brief ULogger class and convenient macros