pull/7689/head
Alexander Alekhin 8 years ago
parent 497d0fd2e7
commit 19270eeab4
  1. 5
      apps/haartraining/createsamples.cpp
  2. 2
      modules/core/src/gpumat.cpp
  3. 10
      modules/gpu/include/opencv2/gpu/gpu.hpp

@ -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"

@ -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

@ -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__ */

Loading…
Cancel
Save