generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed Android build

Browse Source
This commit is contained in:
Andrey Kamaev
2012-06-08 08:11:17 +00:00
parent ec0ec69307
commit 2f40905548
22 changed files with 170 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/videostab/include/opencv2/videostab/global_motion.hpp
View File

@@ -53,7 +53,7 @@
#include "opencv2/videostab/motion_core.hpp"
#include "opencv2/videostab/outlier_rejection.hpp"
#if HAVE_OPENCV_GPU
#ifdef HAVE_OPENCV_GPU
#include "opencv2/gpu/gpu.hpp"
#endif
@@ -73,7 +73,7 @@ CV_EXPORTS Mat estimateGlobalMotionRobust(
class CV_EXPORTS MotionEstimatorBase
{
public:
public:
virtual ~MotionEstimatorBase() {}
virtual void setMotionModel(MotionModel val) { motionModel_ = val; }
@@ -200,7 +200,7 @@ private:
std::vector<Point2f> pointsPrevGood_, pointsGood_;
};
#if HAVE_OPENCV_GPU
#ifdef HAVE_OPENCV_GPU
class CV_EXPORTS KeypointBasedMotionEstimatorGpu : public ImageMotionEstimatorBase
{
public:

4
modules/videostab/include/opencv2/videostab/optical_flow.hpp
View File

@@ -46,7 +46,7 @@
#include "opencv2/core/core.hpp"
#include "opencv2/opencv_modules.hpp"
#if HAVE_OPENCV_GPU
#ifdef HAVE_OPENCV_GPU
#include "opencv2/gpu/gpu.hpp"
#endif
@@ -99,7 +99,7 @@ public:
OutputArray status, OutputArray errors);
};
#if HAVE_OPENCV_GPU
#ifdef HAVE_OPENCV_GPU
class CV_EXPORTS SparsePyrLkOptFlowEstimatorGpu
: public PyrLkOptFlowEstimatorBase, public ISparseOptFlowEstimator
{

4
modules/videostab/include/opencv2/videostab/wobble_suppression.hpp
View File

@@ -48,7 +48,7 @@
#include "opencv2/videostab/global_motion.hpp"
#include "opencv2/videostab/log.hpp"
#if HAVE_OPENCV_GPU
#ifdef HAVE_OPENCV_GPU
#include "opencv2/gpu/gpu.hpp"
#endif
@@ -119,7 +119,7 @@ private:
Mat_<float> mapx_, mapy_;
};
#if HAVE_OPENCV_GPU
#ifdef HAVE_OPENCV_GPU
class CV_EXPORTS MoreAccurateMotionWobbleSuppressorGpu : public MoreAccurateMotionWobbleSuppressorBase
{
public: