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 remote-tracking branch 'upstream/3.4' into merge-3.4

Browse Source
This commit is contained in:
Alexander Alekhin
2021-12-03 12:32:49 +00:00
parent c3910807c5 35ff9af6ce
commit 8b4fa2605e
89 changed files with 1116 additions and 542 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/imgproc/test/test_imgwarp.cpp
+3 -3
View File
@@ -169,7 +169,7 @@ int CV_ImgWarpBaseTest::prepare_test_case( int test_case_idx )
}
break;
default:
assert(0);
CV_Assert(0);
}
/*switch( depth )
@@ -187,7 +187,7 @@ int CV_ImgWarpBaseTest::prepare_test_case( int test_case_idx )
((float*)ptr)[j] = (float)buffer[j];
break;
default:
assert(0);
CV_Assert(0);
}*/
cv::Mat src(1, cols*cn, CV_32F, &buffer[0]);
cv::Mat dst(1, cols*cn, depth, ptr);
@@ -482,7 +482,7 @@ static void test_remap( const Mat& src, Mat& dst, const Mat& mapx, const Mat& ma
}
break;
default:
assert(0);
CV_Assert(0);
}
}
}