From: Andrey Kamaev Date: Fri, 25 May 2012 13:13:51 +0000 (+0000) Subject: Fixed some build warnings X-Git-Tag: accepted/tizen/6.0/unified/20201030.111113~4872 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=eb90882b2d9c1ab558a7865b22dc1b8a51eb1f0d;p=platform%2Fupstream%2Fopencv.git Fixed some build warnings --- diff --git a/modules/videostab/src/clp.hpp b/modules/videostab/src/clp.hpp index d819e5f..e6a1e9d 100644 --- 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" diff --git a/samples/c/fback_c.c b/samples/c/fback_c.c index 7515bcc..3bc5063 100644 --- a/samples/c/fback_c.c +++ b/samples/c/fback_c.c @@ -1,5 +1,6 @@ #include "opencv2/video/tracking.hpp" #include "opencv2/highgui/highgui.hpp" +#include "opencv2/imgproc/imgproc_c.h" #include void help() { diff --git a/samples/c/motempl.c b/samples/c/motempl.c index 822a429..ebcc8d8 100644 --- a/samples/c/motempl.c +++ b/samples/c/motempl.c @@ -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 #include #include