Fixed some build warnings
authorAndrey Kamaev <no@email>
Fri, 25 May 2012 13:13:51 +0000 (13:13 +0000)
committerAndrey Kamaev <no@email>
Fri, 25 May 2012 13:13:51 +0000 (13:13 +0000)
modules/videostab/src/clp.hpp
samples/c/fback_c.c
samples/c/motempl.c

index d819e5f..e6a1e9d 100644 (file)
 #define __OPENCV_VIDEOSTAB_CLP_HPP__
 
 #ifdef HAVE_CLP
+  #undef PACKAGE
+  #undef PACKAGE_BUGREPORT
+  #undef PACKAGE_NAME
+  #undef PACKAGE_STRING
+  #undef PACKAGE_TARNAME
+  #undef PACKAGE_VERSION
+  #undef VERSION
   #include "ClpSimplex.hpp"
   #include "ClpPresolve.hpp"
   #include "ClpPrimalColumnSteepest.hpp"
index 7515bcc..3bc5063 100644 (file)
@@ -1,5 +1,6 @@
 #include "opencv2/video/tracking.hpp"
 #include "opencv2/highgui/highgui.hpp"
+#include "opencv2/imgproc/imgproc_c.h"
 #include <stdio.h>
 void help()
 {
index 822a429..ebcc8d8 100644 (file)
@@ -1,6 +1,6 @@
 #include "opencv2/video/tracking.hpp"
-#include "opencv2/imgproc/imgproc.hpp"
 #include "opencv2/highgui/highgui.hpp"
+#include "opencv2/imgproc/imgproc_c.h"
 #include <time.h>
 #include <stdio.h>
 #include <ctype.h>