[opencv] 28/89: warnings

[Nobuhiro Iwamatsu]

This is an automated email from the git hooks/post-receive script.

iwamatsu pushed a commit to annotated tag 2.4.13.2
in repository opencv.

commit 19270eeab41e678e3bae64f55c941fa95222e364
Author: Alexander Alekhin <alexander.alekhin at intel.com>
Date:   Tue Nov 15 16:13:30 2016 +0300

    warnings
---
 apps/haartraining/createsamples.cpp     |  5 +++++
 modules/core/src/gpumat.cpp             |  2 +-
 modules/gpu/include/opencv2/gpu/gpu.hpp | 10 ++++++++++
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/apps/haartraining/createsamples.cpp b/apps/haartraining/createsamples.cpp
index 4d01fbd..f0a8eab 100644
--- a/apps/haartraining/createsamples.cpp
+++ b/apps/haartraining/createsamples.cpp
@@ -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"
diff --git a/modules/core/src/gpumat.cpp b/modules/core/src/gpumat.cpp
index 9669191..5065deb 100644
--- a/modules/core/src/gpumat.cpp
+++ b/modules/core/src/gpumat.cpp
@@ -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
diff --git a/modules/gpu/include/opencv2/gpu/gpu.hpp b/modules/gpu/include/opencv2/gpu/gpu.hpp
index de16982..088b524 100644
--- a/modules/gpu/include/opencv2/gpu/gpu.hpp
+++ b/modules/gpu/include/opencv2/gpu/gpu.hpp
@@ -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__ */

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/opencv.git