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 
Conflicts:
	modules/contrib/src/basicretinafilter.hpp
	modules/contrib/src/magnoretinafilter.hpp
	modules/contrib/src/parvoretinafilter.hpp
	modules/contrib/src/retinacolor.hpp
	modules/gpu/include/opencv2/gpu/gpu.hpp
	modules/highgui/src/cap_tyzx.cpp
	modules/ocl/perf/perf_filters.cpp
	modules/ocl/src/haar.cpp
	modules/ocl/src/opencl/haarobjectdetect.cl
	modules/ocl/test/test_filters.cpp
	modules/ocl/test/test_objdetect.cpp
This commit is contained in:
Roman Donchenko
2014-03-03 13:45:22 +04:00
parent 37580687e6 af8aa8a2fa
commit db85c35e69
17 changed files with 41 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/core/test/test_ds.cpp
View File

@@ -1355,7 +1355,7 @@ int Core_SetTest::test_set_ops( int iters )
(cvset->total == 0 || cvset->total >= prev_total),
"The total number of cvset elements is not correct" );
// CvSet and simple set do not neccessary have the same "total" (active & free) number,
// CvSet and simple set do not necessary have the same "total" (active & free) number,
// so pass "set->total" to skip that check
test_seq_block_consistence( struct_idx, (CvSeq*)cvset, cvset->total );
update_progressbar();
@@ -1777,7 +1777,7 @@ int Core_GraphTest::test_graph_ops( int iters )
(graph->edges->total == 0 || graph->edges->total >= prev_edge_total),
"The total number of graph vertices is not correct" );
// CvGraph and simple graph do not neccessary have the same "total" (active & free) number,
// CvGraph and simple graph do not necessary have the same "total" (active & free) number,
// so pass "graph->total" (or "graph->edges->total") to skip that check
test_seq_block_consistence( struct_idx, (CvSeq*)graph, graph->total );
test_seq_block_consistence( struct_idx, (CvSeq*)graph->edges, graph->edges->total );