generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed warning

Browse Source
This commit is contained in:
Ilya Lavrenov
2014-04-14 14:39:46 +04:00
parent ad7f2311c0
commit 884b706b3a
6 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/core/src/stat.cpp
View File

@@ -696,7 +696,7 @@ int cv::countNonZero( InputArray _src )
if (src.dims <= 2 || src.isContinuous()) if (src.dims <= 2 || src.isContinuous())
{ {
IppiSize roiSize = { src.cols, src.rows }; IppiSize roiSize = { src.cols, src.rows };
Ipp32s count, srcstep = (Ipp32s)src.step; Ipp32s count = 0, srcstep = (Ipp32s)src.step;
IppStatus status = (IppStatus)-1; IppStatus status = (IppStatus)-1;
if (src.isContinuous()) if (src.isContinuous())

2
modules/imgproc/perf/opencl/perf_filters.cpp
View File

@@ -112,7 +112,7 @@ OCL_PERF_TEST_P(LaplacianFixture, Laplacian,
const FilterParams params = GetParam(); const FilterParams params = GetParam();
const Size srcSize = get<0>(params); const Size srcSize = get<0>(params);
const int type = get<1>(params), ksize = get<2>(params); const int type = get<1>(params), ksize = get<2>(params);
const double eps = CV_MAT_DEPTH(type) <= CV_32S ? 1 : 1e-5; const double eps = CV_MAT_DEPTH(type) <= CV_32S ? 1 : 2e-5;
checkDeviceMaxMemoryAllocSize(srcSize, type); checkDeviceMaxMemoryAllocSize(srcSize, type);

2
modules/imgproc/src/deriv.cpp
View File

@@ -607,6 +607,7 @@ void cv::Laplacian( InputArray _src, OutputArray _dst, int ddepth, int ksize,
} \ } \
} while ((void)0, 0) } while ((void)0, 0)
CV_SUPPRESS_DEPRECATED_START
if (sdepth == CV_8U && ddepth == CV_16S && !floatScale && !floatDelta) if (sdepth == CV_8U && ddepth == CV_16S && !floatScale && !floatDelta)
{ {
IPP_FILTER_LAPLACIAN(Ipp8u, Ipp16s, 8u16s); IPP_FILTER_LAPLACIAN(Ipp8u, Ipp16s, 8u16s);
@@ -625,6 +626,7 @@ void cv::Laplacian( InputArray _src, OutputArray _dst, int ddepth, int ksize,
if (needDelta && status >= 0) if (needDelta && status >= 0)
status = ippiAddC_32f_C1IR((Ipp32f)delta, (Ipp32f *)dst.data, (int)dst.step, roisize); status = ippiAddC_32f_C1IR((Ipp32f)delta, (Ipp32f *)dst.data, (int)dst.step, roisize);
} }
CV_SUPPRESS_DEPRECATED_END
if (status >= 0) if (status >= 0)
return; return;

8
modules/imgproc/src/filter.cpp
View File

@@ -1413,14 +1413,14 @@ struct RowVec_32f
{ {
kernel = _kernel; kernel = _kernel;
haveSSE = checkHardwareSupport(CV_CPU_SSE); haveSSE = checkHardwareSupport(CV_CPU_SSE);
#ifdef USE_IPP_SEP_FILTERS #if defined USE_IPP_SEP_FILTERS && 0
bufsz = -1; bufsz = -1;
#endif #endif
} }
int operator()(const uchar* _src, uchar* _dst, int width, int cn) const int operator()(const uchar* _src, uchar* _dst, int width, int cn) const
{ {
#ifdef USE_IPP_SEP_FILTERS #if defined USE_IPP_SEP_FILTERS && 0
int ret = ippiOperator(_src, _dst, width, cn); int ret = ippiOperator(_src, _dst, width, cn);
if (ret > 0) if (ret > 0)
return ret; return ret;
@@ -1458,13 +1458,13 @@ struct RowVec_32f
Mat kernel; Mat kernel;
bool haveSSE; bool haveSSE;
#ifdef USE_IPP_SEP_FILTERS #if defined USE_IPP_SEP_FILTERS && 0
private: private:
mutable int bufsz; mutable int bufsz;
int ippiOperator(const uchar* _src, uchar* _dst, int width, int cn) const int ippiOperator(const uchar* _src, uchar* _dst, int width, int cn) const
{ {
int _ksize = kernel.rows + kernel.cols - 1; int _ksize = kernel.rows + kernel.cols - 1;
// if ((1 != cn && 3 != cn) || width < _ksize*8) if ((1 != cn && 3 != cn) || width < _ksize*8)
return 0; return 0;
const float* src = (const float*)_src; const float* src = (const float*)_src;

2
modules/imgproc/src/histogram.cpp
View File

@@ -1242,7 +1242,7 @@ void cv::calcHist( const Mat* images, int nimages, const int* channels,
bool ok = true; bool ok = true;
const Mat & src = images[0]; const Mat & src = images[0];
int nstripes = std::min<int>(8, src.total() / (1 << 16)); int nstripes = std::min<int>(8, static_cast<int>(src.total() / (1 << 16)));
#ifdef HAVE_CONCURRENCY #ifdef HAVE_CONCURRENCY
nstripes = 1; nstripes = 1;
#endif #endif

2
modules/imgproc/src/moments.cpp
View File

@@ -474,6 +474,7 @@ cv::Moments cv::moments( InputArray _src, bool binary )
// ippiMomentInitAlloc_64f, ippiMomentFree_64f are deprecated in 8.1, but there are not another way // ippiMomentInitAlloc_64f, ippiMomentFree_64f are deprecated in 8.1, but there are not another way
// to initialize IppiMomentState_64f. When GetStateSize and Init functions will appear we have to // to initialize IppiMomentState_64f. When GetStateSize and Init functions will appear we have to
// change our code. // change our code.
CV_SUPPRESS_DEPRECATED_START
if (0 <= ippiMomentInitAlloc_64f(&moment, ippAlgHintAccurate)) if (0 <= ippiMomentInitAlloc_64f(&moment, ippAlgHintAccurate))
{ {
IppStatus sts = (IppStatus)(-1); IppStatus sts = (IppStatus)(-1);
@@ -518,6 +519,7 @@ cv::Moments cv::moments( InputArray _src, bool binary )
} }
ippiMomentFree_64f(moment); ippiMomentFree_64f(moment);
} }
CV_SUPPRESS_DEPRECATED_END
} }
#endif #endif