Fixed some build warnings

eb90882b · Andrey Kamaev · ca6d2fe7 · eb90882b · eb90882b · eb90882b
Commit eb90882b authored May 25, 2012 by Andrey Kamaev
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 1 deletion

clp.hpp modules/videostab/src/clp.hpp +7 -0

fback_c.c samples/c/fback_c.c +1 -0

motempl.c samples/c/motempl.c +1 -1

No files found.
--- a/modules/videostab/src/clp.hpp
+++ b/modules/videostab/src/clp.hpp
@@ -44,6 +44,13 @@
 #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"

--- a/samples/c/fback_c.c
+++ b/samples/c/fback_c.c
 #include "opencv2/video/tracking.hpp"
 #include "opencv2/highgui/highgui.hpp"
+#include "opencv2/imgproc/imgproc_c.h"
 #include <stdio.h>
 void help()
 {

--- a/samples/c/motempl.c
+++ b/samples/c/motempl.c
 #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>