potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-31 08:13:04 +04:00
Code Packages Releases Wiki Activity

Merge pull request #7689 from alalek:warnings_2.4

Browse Source
This commit is contained in:
Vadim Pisarevsky
2016-11-22 13:30:25 +00:00
parent 7b13550bdd 0a543c5531
commit af8e6b06f7
25 changed files with 96 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/core/include/opencv2/core/cuda_devptrs.hpp
+9 -14
View File
@@ -122,27 +122,23 @@ namespace cv
typedef PtrStep<float> PtrStepf;
typedef PtrStep<int> PtrStepi;
#if defined __GNUC__
#define __CV_GPU_DEPR_BEFORE__
#define __CV_GPU_DEPR_AFTER__ __attribute__ ((deprecated))
#define CV_GPU_DEPRECATED __attribute__ ((deprecated))
#elif defined(__MSVC__) //|| defined(__CUDACC__)
#pragma deprecated(DevMem2D_)
#define __CV_GPU_DEPR_BEFORE__ __declspec(deprecated)
#define __CV_GPU_DEPR_AFTER__
#define CV_GPU_DEPRECATED __declspec(deprecated)
#else
#define __CV_GPU_DEPR_BEFORE__
#define __CV_GPU_DEPR_AFTER__
#define CV_GPU_DEPRECATED
#endif
template <typename T> struct __CV_GPU_DEPR_BEFORE__ DevMem2D_ : public PtrStepSz<T>
template <typename T> struct DevMem2D_ : public PtrStepSz<T>
{
DevMem2D_() {}
DevMem2D_(int rows_, int cols_, T* data_, size_t step_) : PtrStepSz<T>(rows_, cols_, data_, step_) {}
CV_GPU_DEPRECATED DevMem2D_() {}
CV_GPU_DEPRECATED DevMem2D_(int rows_, int cols_, T* data_, size_t step_) : PtrStepSz<T>(rows_, cols_, data_, step_) {}
template <typename U>
explicit __CV_GPU_DEPR_BEFORE__ DevMem2D_(const DevMem2D_<U>& d) : PtrStepSz<T>(d.rows, d.cols, (T*)d.data, d.step) {}
} __CV_GPU_DEPR_AFTER__ ;
explicit CV_GPU_DEPRECATED DevMem2D_(const DevMem2D_<U>& d) : PtrStepSz<T>(d.rows, d.cols, (T*)d.data, d.step) {}
};
typedef DevMem2D_<unsigned char> DevMem2Db;
typedef DevMem2Db DevMem2D;
@@ -174,8 +170,7 @@ namespace cv
typedef PtrElemStep_<float> PtrElemStepf;
typedef PtrElemStep_<int> PtrElemStepi;
//#undef __CV_GPU_DEPR_BEFORE__
//#undef __CV_GPU_DEPR_AFTER__
//#undef CV_GPU_DEPRECATED
namespace device
{
modules/core/include/opencv2/core/gpumat.hpp
+3 -4
View File
@@ -277,10 +277,9 @@ namespace cv { namespace gpu
template <typename _Tp> operator PtrStep<_Tp>() const;
// Deprecated function
__CV_GPU_DEPR_BEFORE__ template <typename _Tp> operator DevMem2D_<_Tp>() const __CV_GPU_DEPR_AFTER__;
__CV_GPU_DEPR_BEFORE__ template <typename _Tp> operator PtrStep_<_Tp>() const __CV_GPU_DEPR_AFTER__;
#undef __CV_GPU_DEPR_BEFORE__
#undef __CV_GPU_DEPR_AFTER__
template <typename _Tp> CV_GPU_DEPRECATED operator DevMem2D_<_Tp>() const;
template <typename _Tp> CV_GPU_DEPRECATED operator PtrStep_<_Tp>() const;
#undef CV_GPU_DEPRECATED
/*! includes several bit-fields:
- the magic signature
modules/core/include/opencv2/core/internal.hpp
+1 -1
View File
@@ -292,7 +292,7 @@ namespace cv
return classname##_info_var; \
} \
\
static ::cv::AlgorithmInfo& classname##_info_auto = classname##_info(); \
CV_ATTR_USED static ::cv::AlgorithmInfo& classname##_info_auto = classname##_info(); \
\
::cv::AlgorithmInfo* classname::info() const \
{ \
modules/core/include/opencv2/core/types_c.h
+9
View File
@@ -43,6 +43,15 @@
#ifndef __OPENCV_CORE_TYPES_H__
#define __OPENCV_CORE_TYPES_H__
#if defined(__GNUC__) && !defined(COMPILER_ICC)
# define CV_ATTR_UNUSED __attribute__((unused))
# define CV_ATTR_USED __attribute__((used))
#else
# define CV_ATTR_UNUSED
# define CV_ATTR_USED
#endif
#if !defined _CRT_SECURE_NO_DEPRECATE && defined _MSC_VER
# if _MSC_VER > 1300
# define _CRT_SECURE_NO_DEPRECATE /* to avoid multiple Visual Studio 2005 warnings */
modules/core/src/gpumat.cpp
+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
modules/core/src/system.cpp
+9
View File
@@ -908,6 +908,11 @@ int _interlockedExchangeAdd(int* addr, int delta)
#elif defined __APPLE__
#if defined(__clang__)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
#endif
#include <libkern/OSAtomic.h>
struct Mutex::Impl
@@ -923,6 +928,10 @@ struct Mutex::Impl
int refcount;
};
#if defined(__clang__)
#pragma clang diagnostic pop
#endif
#elif defined __linux__ && !defined ANDROID && !defined __LINUXTHREADS_OLD__
struct Mutex::Impl
modules/core/test/test_ds.cpp
+1 -1
View File
@@ -56,7 +56,7 @@ static void cvTsSimpleSeqShiftAndCopy( CvTsSimpleSeq* seq, int from_idx, int to_
(seq->count - from_idx)*elem_size );
}
seq->count += to_idx - from_idx;
if( elem && to_idx > from_idx )
if( elem )
memcpy( seq->array + from_idx*elem_size, elem, (to_idx - from_idx)*elem_size );
}