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

Merge remote-tracking branch 'origin/2.4' into merge-2.4

Browse Source
This commit is contained in:
Roman Donchenko
2014-06-02 13:43:28 +04:00
parent abe37659cc 9a5e9d3442
commit 33087f9eaa
5 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/core/test/test_math.cpp
View File

@@ -1356,7 +1356,7 @@ void Core_DetTest::get_test_array_types_and_sizes( int test_case_idx, vector<vec
{
Base::get_test_array_types_and_sizes( test_case_idx, sizes, types );
sizes[INPUT][0].width = sizes[INPUT][0].height = sizes[INPUT][0].height;
sizes[INPUT][0].width = sizes[INPUT][0].height;
sizes[TEMP][0] = sizes[INPUT][0];
types[TEMP][0] = CV_64FC1;
}