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

Fixed warnings for IPP9+ build;

Browse Source
This commit is contained in:
Pavel Vlasov 2015-12-01 16:10:29 +03:00
parent a0f8645541
commit 2b27f7dbb3
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4624,7 +4624,7 @@ static bool ipp_filter2D( InputArray _src, OutputArray _dst, int ddepth,
IppAutoBuffer<Ipp32f> kerTmp; IppAutoBuffer<Ipp32f> kerTmp;
int kerStep = sizeof(Ipp32f)*kernelSize.width; int kerStep = sizeof(Ipp32f)*kernelSize.width;
#if IPP_VERSION_X100 >= 900 #if IPP_VERSION_X100 >= 900
if(kernel.step != kerStep) if((int)kernel.step != kerStep)
{ {
kerTmp.Alloc(kerStep*kernelSize.height); kerTmp.Alloc(kerStep*kernelSize.height);
if(ippiCopy_32f_C1R((Ipp32f*)kernel.data, (int)kernel.step, kerTmp, kerStep, kernelSize) < 0) if(ippiCopy_32f_C1R((Ipp32f*)kernel.data, (int)kernel.step, kerTmp, kerStep, kernelSize) < 0)
@ -4651,7 +4651,7 @@ static bool ipp_filter2D( InputArray _src, OutputArray _dst, int ddepth,
IppAutoBuffer<Ipp16s> kerTmp; IppAutoBuffer<Ipp16s> kerTmp;
int kerStep = sizeof(Ipp16s)*kernelSize.width; int kerStep = sizeof(Ipp16s)*kernelSize.width;
#if IPP_VERSION_X100 >= 900 #if IPP_VERSION_X100 >= 900
if(kernel.step != kerStep) if((int)kernel.step != kerStep)
{ {
kerTmp.Alloc(kerStep*kernelSize.height); kerTmp.Alloc(kerStep*kernelSize.height);
if(ippiCopy_16s_C1R((Ipp16s*)kernel.data, (int)kernel.step, kerTmp, kerStep, kernelSize) < 0) if(ippiCopy_16s_C1R((Ipp16s*)kernel.data, (int)kernel.step, kerTmp, kerStep, kernelSize) < 0)

4
modules/imgproc/src/hough.cpp
View File

@ -96,7 +96,7 @@ HoughLinesStandard( const Mat& img, float rho, float theta,
int numangle = cvRound((max_theta - min_theta) / theta); int numangle = cvRound((max_theta - min_theta) / theta);
int numrho = cvRound(((width + height) * 2 + 1) / rho); int numrho = cvRound(((width + height) * 2 + 1) / rho);
#if defined HAVE_IPP && !defined(HAVE_IPP_ICV_ONLY) && IPP_VERSION_X100 >= 810 && IPP_DISABLED_BLOCK #if defined HAVE_IPP && !defined(HAVE_IPP_ICV_ONLY) && IPP_VERSION_X100 >= 810 && IPP_DISABLE_BLOCK
CV_IPP_CHECK() CV_IPP_CHECK()
{ {
IppiSize srcSize = { width, height }; IppiSize srcSize = { width, height };
@ -429,7 +429,7 @@ HoughLinesProbabilistic( Mat& image,
int numangle = cvRound(CV_PI / theta); int numangle = cvRound(CV_PI / theta);
int numrho = cvRound(((width + height) * 2 + 1) / rho); int numrho = cvRound(((width + height) * 2 + 1) / rho);
#if defined HAVE_IPP && !defined(HAVE_IPP_ICV_ONLY) && IPP_VERSION_X100 >= 810 && IPP_DISABLED_BLOCK #if defined HAVE_IPP && !defined(HAVE_IPP_ICV_ONLY) && IPP_VERSION_X100 >= 810 && IPP_DISABLE_BLOCK
CV_IPP_CHECK() CV_IPP_CHECK()
{ {
IppiSize srcSize = { width, height }; IppiSize srcSize = { width, height };

2
modules/imgproc/test/test_houghLines.cpp
View File

@ -189,7 +189,7 @@ void BaseHoughLineTest::run_test(int type)
else if (type == PROBABILISTIC) else if (type == PROBABILISTIC)
count = countMatIntersection<Vec4i>(exp_lines, lines, 1e-4f, 0.f); count = countMatIntersection<Vec4i>(exp_lines, lines, 1e-4f, 0.f);
#if defined HAVE_IPP && !defined(HAVE_IPP_ICV_ONLY) && IPP_VERSION_X100 >= 810 && IPP_DISABLED_BLOCK #if defined HAVE_IPP && !defined(HAVE_IPP_ICV_ONLY) && IPP_VERSION_X100 >= 810 && IPP_DISABLE_BLOCK
EXPECT_GE( count, (int) (exp_lines.total() * 0.8) ); EXPECT_GE( count, (int) (exp_lines.total() * 0.8) );
#else #else
EXPECT_EQ( count, (int) exp_lines.total()); EXPECT_EQ( count, (int) exp_lines.total());