1
0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 07:43:03 +04:00
This commit is contained in:
Alexander Alekhin
2016-11-15 16:13:30 +03:00
parent 497d0fd2e7
commit 19270eeab4
3 changed files with 16 additions and 1 deletions
+5
View File
@@ -52,6 +52,11 @@
#include <ctime>
#include <memory>
// std::auto_ptr
#if defined(__GNUC__) && __GNUC__ >= 6
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
using namespace std;
#include "cvhaartraining.h"
+1 -1
View File
@@ -700,7 +700,7 @@ void cv::gpu::GpuMat::create(int _rows, int _cols, int _type)
size_t esz = elemSize();
void* devPtr;
void* devPtr = NULL;
gpuFuncTable()->mallocPitch(&devPtr, &step, esz * cols, rows);
// Single row must be continuous
+10
View File
@@ -54,6 +54,12 @@
#include "opencv2/objdetect/objdetect.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 {
//////////////////////////////// CudaMem ////////////////////////////////
@@ -2527,4 +2533,8 @@ CV_EXPORTS void calcWobbleSuppressionMaps(
} // namespace cv
#if defined(__GNUC__) && __GNUC__ >= 6
#pragma GCC diagnostic pop
#endif
#endif /* __OPENCV_GPU_HPP__ */