Commit 19270eea authored by Alexander Alekhin's avatar Alexander Alekhin

warnings

parent 497d0fd2
...@@ -52,6 +52,11 @@ ...@@ -52,6 +52,11 @@
#include <ctime> #include <ctime>
#include <memory> #include <memory>
// std::auto_ptr
#if defined(__GNUC__) && __GNUC__ >= 6
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
using namespace std; using namespace std;
#include "cvhaartraining.h" #include "cvhaartraining.h"
......
...@@ -700,7 +700,7 @@ void cv::gpu::GpuMat::create(int _rows, int _cols, int _type) ...@@ -700,7 +700,7 @@ void cv::gpu::GpuMat::create(int _rows, int _cols, int _type)
size_t esz = elemSize(); size_t esz = elemSize();
void* devPtr; void* devPtr = NULL;
gpuFuncTable()->mallocPitch(&devPtr, &step, esz * cols, rows); gpuFuncTable()->mallocPitch(&devPtr, &step, esz * cols, rows);
// Single row must be continuous // Single row must be continuous
......
...@@ -54,6 +54,12 @@ ...@@ -54,6 +54,12 @@
#include "opencv2/objdetect/objdetect.hpp" #include "opencv2/objdetect/objdetect.hpp"
#include "opencv2/features2d/features2d.hpp" #include "opencv2/features2d/features2d.hpp"
// std::auto_ptr
#if defined(__GNUC__) && __GNUC__ >= 6
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
namespace cv { namespace gpu { namespace cv { namespace gpu {
//////////////////////////////// CudaMem //////////////////////////////// //////////////////////////////// CudaMem ////////////////////////////////
...@@ -2527,4 +2533,8 @@ CV_EXPORTS void calcWobbleSuppressionMaps( ...@@ -2527,4 +2533,8 @@ CV_EXPORTS void calcWobbleSuppressionMaps(
} // namespace cv } // namespace cv
#if defined(__GNUC__) && __GNUC__ >= 6
#pragma GCC diagnostic pop
#endif
#endif /* __OPENCV_GPU_HPP__ */ #endif /* __OPENCV_GPU_HPP__ */
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