Skip to content

Commit 951b743

Browse files
author
Roman Donchenko
committed
Merge branch '2.4'
Conflicts: testdata/perf/ocl.xml
2 parents 5e01104 + f0a63a3 commit 951b743

File tree

1 file changed

+62
-30
lines changed

1 file changed

+62
-30
lines changed

‎testdata/perf/ocl.xml‎

Lines changed: 62 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -951,36 +951,6 @@
951951
<x>424</x>
952952
<y>184</y>
953953
<val>7.7660880982875824e-002</val></rng2></flowy></FarnebackOpticalFlowFixture_FarnebackOpticalFlow--FarnebackOpticalFlow----7--1-5---OPTFLOW_FARNEBACK_GAUSSIAN--true->
954-
<normFixture_norm--norm--1000x1000>
955-
<value>
956-
<kind>131072</kind>
957-
<type>6</type>
958-
<val type_id="opencv-matrix">
959-
<rows>1</rows>
960-
<cols>1</cols>
961-
<dt>d</dt>
962-
<data>
963-
0.</data></val></value></normFixture_norm--norm--1000x1000>
964-
<normFixture_norm--norm--2000x2000>
965-
<value>
966-
<kind>131072</kind>
967-
<type>6</type>
968-
<val type_id="opencv-matrix">
969-
<rows>1</rows>
970-
<cols>1</cols>
971-
<dt>d</dt>
972-
<data>
973-
0.</data></val></value></normFixture_norm--norm--2000x2000>
974-
<normFixture_norm--norm--4000x4000>
975-
<value>
976-
<kind>131072</kind>
977-
<type>6</type>
978-
<val type_id="opencv-matrix">
979-
<rows>1</rows>
980-
<cols>1</cols>
981-
<dt>d</dt>
982-
<data>
983-
0.</data></val></value></normFixture_norm--norm--4000x4000>
984954
<MomentsFixture_Moments--Moments---1000x1000--8UC1->
985955
<dst>
986956
<kind>65536</kind>
@@ -8128,4 +8098,66 @@
81288098
<dt>d</dt>
81298099
<data>
81308100
0.</data></val></value></Size_Dp_MinDist_OCL_HoughCircles--OCL_HoughCircles---1920x1080--4--10->
8101+
<!-- resumed -->
8102+
8103+
<normFixture_norm--norm---1000x1000--8UC1->
8104+
<value>
8105+
<kind>131072</kind>
8106+
<type>6</type>
8107+
<val type_id="opencv-matrix">
8108+
<rows>1</rows>
8109+
<cols>1</cols>
8110+
<dt>d</dt>
8111+
<data>
8112+
255.</data></val></value></normFixture_norm--norm---1000x1000--8UC1->
8113+
<normFixture_norm--norm---1000x1000--32FC1->
8114+
<value>
8115+
<kind>131072</kind>
8116+
<type>6</type>
8117+
<val type_id="opencv-matrix">
8118+
<rows>1</rows>
8119+
<cols>1</cols>
8120+
<dt>d</dt>
8121+
<data>
8122+
8.1801015625000000e+03</data></val></value></normFixture_norm--norm---1000x1000--32FC1->
8123+
<normFixture_norm--norm---2000x2000--8UC1->
8124+
<value>
8125+
<kind>131072</kind>
8126+
<type>6</type>
8127+
<val type_id="opencv-matrix">
8128+
<rows>1</rows>
8129+
<cols>1</cols>
8130+
<dt>d</dt>
8131+
<data>
8132+
255.</data></val></value></normFixture_norm--norm---2000x2000--8UC1->
8133+
<normFixture_norm--norm---2000x2000--32FC1->
8134+
<value>
8135+
<kind>131072</kind>
8136+
<type>6</type>
8137+
<val type_id="opencv-matrix">
8138+
<rows>1</rows>
8139+
<cols>1</cols>
8140+
<dt>d</dt>
8141+
<data>
8142+
8.1842363281250000e+03</data></val></value></normFixture_norm--norm---2000x2000--32FC1->
8143+
<normFixture_norm--norm---4000x4000--8UC1->
8144+
<value>
8145+
<kind>131072</kind>
8146+
<type>6</type>
8147+
<val type_id="opencv-matrix">
8148+
<rows>1</rows>
8149+
<cols>1</cols>
8150+
<dt>d</dt>
8151+
<data>
8152+
255.</data></val></value></normFixture_norm--norm---4000x4000--8UC1->
8153+
<normFixture_norm--norm---4000x4000--32FC1->
8154+
<value>
8155+
<kind>131072</kind>
8156+
<type>6</type>
8157+
<val type_id="opencv-matrix">
8158+
<rows>1</rows>
8159+
<cols>1</cols>
8160+
<dt>d</dt>
8161+
<data>
8162+
8.1874501953125000e+03</data></val></value></normFixture_norm--norm---4000x4000--32FC1->
81318163
</opencv_storage>

0 commit comments

Comments
 (0)