Merge pull request #5376 from lupustr3:pvlasov/compare_16s_fix

This commit is contained in:
Alexander Alekhin 2015-09-22 10:19:52 +00:00
commit 4bb4c92f68

View File

@ -4692,7 +4692,7 @@ static void cmp16s(const short* src1, size_t step1, const short* src2, size_t st
CV_IPP_CHECK() CV_IPP_CHECK()
{ {
IppCmpOp op = convert_cmp(*(int *)_cmpop); IppCmpOp op = convert_cmp(*(int *)_cmpop);
if( op > 0 ) if( op >= 0 )
{ {
fixSteps(size, sizeof(dst[0]), step1, step2, step); fixSteps(size, sizeof(dst[0]), step1, step2, step);
if (0 <= ippiCompare_16s_C1R(src1, (int)step1, src2, (int)step2, dst, (int)step, ippiSize(size), op)) if (0 <= ippiCompare_16s_C1R(src1, (int)step1, src2, (int)step2, dst, (int)step, ippiSize(size), op))