Commit 9086efa8 authored by Vladislav Vinogradov's avatar Vladislav Vinogradov

fixed warnings

parent b47a2012
...@@ -223,6 +223,9 @@ namespace ...@@ -223,6 +223,9 @@ namespace
} }
private: private:
SURF_GPU_Invoker(const SURF_GPU_Invoker&);
SURF_GPU_Invoker& operator =(const SURF_GPU_Invoker&);
SURF_GPU& surf_; SURF_GPU& surf_;
int img_cols, img_rows; int img_cols, img_rows;
......
...@@ -14,14 +14,16 @@ ...@@ -14,14 +14,16 @@
#include "opencv2/highgui/highgui.hpp" #include "opencv2/highgui/highgui.hpp"
#include "opencv2/nonfree/nonfree.hpp" #include "opencv2/nonfree/nonfree.hpp"
#include "opencv2/ts/gpu_test.hpp"
#include "opencv2/opencv_modules.hpp" #include "opencv2/opencv_modules.hpp"
#ifdef HAVE_OPENCV_OCL #ifdef HAVE_OPENCV_OCL
# include "opencv2/nonfree/ocl.hpp" # include "opencv2/nonfree/ocl.hpp"
#endif #endif
#if defined(HAVE_OPENCV_GPU) && defined(HAVE_CUDA) #ifdef HAVE_OPENCV_GPU
#include "opencv2/ts/gpu_test.hpp" # include "opencv2/nonfree/gpu.hpp"
#include "opencv2/nonfree/gpu.hpp"
#endif #endif
#endif #endif
...@@ -109,17 +109,6 @@ static int getMatchedPointsCount(const std::vector<cv::KeyPoint>& keypoints1, co ...@@ -109,17 +109,6 @@ static int getMatchedPointsCount(const std::vector<cv::KeyPoint>& keypoints1, co
return validCount; return validCount;
} }
#define PARAM_TEST_CASE(name, ...) struct name : testing::TestWithParam< std::tr1::tuple< __VA_ARGS__ > >
#define IMPLEMENT_PARAM_CLASS(name, type) \
namespace { class name { \
public: \
name ( type arg = type ()) : val_(arg) {} \
operator type () const {return val_;} \
private: \
type val_; \
}; \
inline void PrintTo( name param, std::ostream* os) {*os << #name << "=" << testing::PrintToString(static_cast< type >(param));}}
IMPLEMENT_PARAM_CLASS(HessianThreshold, double) IMPLEMENT_PARAM_CLASS(HessianThreshold, double)
IMPLEMENT_PARAM_CLASS(Octaves, int) IMPLEMENT_PARAM_CLASS(Octaves, int)
IMPLEMENT_PARAM_CLASS(OctaveLayers, int) IMPLEMENT_PARAM_CLASS(OctaveLayers, int)
......
...@@ -48,8 +48,6 @@ static Ptr<DenseOpticalFlowExt> createOptFlow(const string& name, bool useGpu) ...@@ -48,8 +48,6 @@ static Ptr<DenseOpticalFlowExt> createOptFlow(const string& name, bool useGpu)
cerr << "Incorrect Optical Flow algorithm - " << name << endl; cerr << "Incorrect Optical Flow algorithm - " << name << endl;
exit(-1); exit(-1);
} }
return Ptr<DenseOpticalFlowExt>();
} }
int main(int argc, const char* argv[]) int main(int argc, const char* argv[])
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment