Skip to content

Commit 7ee8c28

Browse files
asmorkalovasmorkalov
committed
Merge branch 4.x
2 parents 6795bee + bbd6332 commit 7ee8c28

File tree

1 file changed

+22
-26
lines changed

1 file changed

+22
-26
lines changed

‎testdata/perf/imgproc.xml‎

Lines changed: 22 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -89238,7 +89238,7 @@
8923889238
<cn>2</cn>
8923989239
<val>60.</val></rng2></dst></Size_CvtMode_cvtColor8u--cvtColor8u---1920x1080--CX_RGBA2Luv->
8924089240
<!-- resumed -->
89241-
<OCL_HoughLinesFixture_HoughLines--HoughLines---640x480--0-1--0-0174533->
89241+
<OCL_HoughLinesFixture_HoughLines--HoughLines---640x480--0-1--0-0174533->
8924289242
<result>
8924389243
<kind>65536</kind>
8924489244
<type>13</type>
@@ -89247,9 +89247,8 @@
8924789247
<cols>1</cols>
8924889248
<dt>"2f"</dt>
8924989249
<data>
89250-
9.99500046e+001 0. 9.99500046e+001 1.57079637e+000
89251-
1.99949997e+002 0. 1.99949997e+002 1.57079637e+000
89252-
3.99950012e+002 0. 3.99950012e+002 1.57079637e+000</data></val></result></OCL_HoughLinesFixture_HoughLines--HoughLines---640x480--0-1--0-0174533->
89250+
100. 0. 100. 1.57079637 200. 0. 200. 1.57079637 400. 0. 400.
89251+
1.57079637</data></val></result></OCL_HoughLinesFixture_HoughLines--HoughLines---640x480--0-1--0-0174533->
8925389252
<OCL_HoughLinesFixture_HoughLines--HoughLines---640x480--0-1--0-1->
8925489253
<result>
8925589254
<kind>65536</kind>
@@ -89259,7 +89258,7 @@
8925989258
<cols>1</cols>
8926089259
<dt>"2f"</dt>
8926189260
<data>
89262-
9.99500046e+001 0. 1.99949997e+002 0. 3.99950012e+002 0.</data></val></result></OCL_HoughLinesFixture_HoughLines--HoughLines---640x480--0-1--0-1->
89261+
100. 0. 200. 0. 400. 0.</data></val></result></OCL_HoughLinesFixture_HoughLines--HoughLines---640x480--0-1--0-1->
8926389262
<OCL_HoughLinesFixture_HoughLines--HoughLines---640x480--1--0-0174533->
8926489263
<result>
8926589264
<kind>65536</kind>
@@ -89269,8 +89268,8 @@
8926989268
<cols>1</cols>
8927089269
<dt>"2f"</dt>
8927189270
<data>
89272-
100. 0. 100. 1.57079637e+000 200. 0. 200. 1.57079637e+000 400.
89273-
0. 400. 1.57079637e+000</data></val></result></OCL_HoughLinesFixture_HoughLines--HoughLines---640x480--1--0-0174533->
89271+
100. 0. 100. 1.57079637 200. 0. 200. 1.57079637 400. 0. 400.
89272+
1.57079637</data></val></result></OCL_HoughLinesFixture_HoughLines--HoughLines---640x480--1--0-0174533->
8927489273
<OCL_HoughLinesFixture_HoughLines--HoughLines---640x480--1--0-1->
8927589274
<result>
8927689275
<kind>65536</kind>
@@ -89290,9 +89289,8 @@
8929089289
<cols>1</cols>
8929189290
<dt>"2f"</dt>
8929289291
<data>
89293-
9.99500046e+001 0. 9.99500046e+001 1.57079637e+000
89294-
1.99949997e+002 0. 1.99949997e+002 1.57079637e+000
89295-
3.99950012e+002 0. 3.99950012e+002 1.57079637e+000</data></val></result></OCL_HoughLinesFixture_HoughLines--HoughLines---1280x720--0-1--0-0174533->
89292+
100. 0. 100. 1.57079637 200. 0. 200. 1.57079637 400. 0. 400.
89293+
1.57079637</data></val></result></OCL_HoughLinesFixture_HoughLines--HoughLines---1280x720--0-1--0-0174533->
8929689294
<OCL_HoughLinesFixture_HoughLines--HoughLines---1280x720--0-1--0-1->
8929789295
<result>
8929889296
<kind>65536</kind>
@@ -89302,7 +89300,7 @@
8930289300
<cols>1</cols>
8930389301
<dt>"2f"</dt>
8930489302
<data>
89305-
9.99500046e+001 0. 1.99949997e+002 0. 3.99950012e+002 0.</data></val></result></OCL_HoughLinesFixture_HoughLines--HoughLines---1280x720--0-1--0-1->
89303+
100. 0. 200. 0. 400. 0.</data></val></result></OCL_HoughLinesFixture_HoughLines--HoughLines---1280x720--0-1--0-1->
8930689304
<OCL_HoughLinesFixture_HoughLines--HoughLines---1280x720--1--0-0174533->
8930789305
<result>
8930889306
<kind>65536</kind>
@@ -89312,8 +89310,8 @@
8931289310
<cols>1</cols>
8931389311
<dt>"2f"</dt>
8931489312
<data>
89315-
100. 0. 100. 1.57079637e+000 200. 0. 200. 1.57079637e+000 400.
89316-
0. 400. 1.57079637e+000</data></val></result></OCL_HoughLinesFixture_HoughLines--HoughLines---1280x720--1--0-0174533->
89313+
100. 0. 100. 1.57079637 200. 0. 200. 1.57079637 400. 0. 400.
89314+
1.57079637</data></val></result></OCL_HoughLinesFixture_HoughLines--HoughLines---1280x720--1--0-0174533->
8931789315
<OCL_HoughLinesFixture_HoughLines--HoughLines---1280x720--1--0-1->
8931889316
<result>
8931989317
<kind>65536</kind>
@@ -89333,9 +89331,8 @@
8933389331
<cols>1</cols>
8933489332
<dt>"2f"</dt>
8933589333
<data>
89336-
9.99500046e+001 0. 9.99500046e+001 1.57079637e+000
89337-
1.99949997e+002 0. 1.99949997e+002 1.57079637e+000
89338-
3.99950012e+002 0. 3.99950012e+002 1.57079637e+000</data></val></result></OCL_HoughLinesFixture_HoughLines--HoughLines---1920x1080--0-1--0-0174533->
89334+
100. 0. 100. 1.57079637 200. 0. 200. 1.57079637 400. 0. 400.
89335+
1.57079637</data></val></result></OCL_HoughLinesFixture_HoughLines--HoughLines---1920x1080--0-1--0-0174533->
8933989336
<OCL_HoughLinesFixture_HoughLines--HoughLines---1920x1080--0-1--0-1->
8934089337
<result>
8934189338
<kind>65536</kind>
@@ -89345,7 +89342,7 @@
8934589342
<cols>1</cols>
8934689343
<dt>"2f"</dt>
8934789344
<data>
89348-
9.99500046e+001 0. 1.99949997e+002 0. 3.99950012e+002 0.</data></val></result></OCL_HoughLinesFixture_HoughLines--HoughLines---1920x1080--0-1--0-1->
89345+
100. 0. 200. 0. 400. 0.</data></val></result></OCL_HoughLinesFixture_HoughLines--HoughLines---1920x1080--0-1--0-1->
8934989346
<OCL_HoughLinesFixture_HoughLines--HoughLines---1920x1080--1--0-0174533->
8935089347
<result>
8935189348
<kind>65536</kind>
@@ -89355,8 +89352,8 @@
8935589352
<cols>1</cols>
8935689353
<dt>"2f"</dt>
8935789354
<data>
89358-
100. 0. 100. 1.57079637e+000 200. 0. 200. 1.57079637e+000 400.
89359-
0. 400. 1.57079637e+000</data></val></result></OCL_HoughLinesFixture_HoughLines--HoughLines---1920x1080--1--0-0174533->
89355+
100. 0. 100. 1.57079637 200. 0. 200. 1.57079637 400. 0. 400.
89356+
1.57079637</data></val></result></OCL_HoughLinesFixture_HoughLines--HoughLines---1920x1080--1--0-0174533->
8936089357
<OCL_HoughLinesFixture_HoughLines--HoughLines---1920x1080--1--0-1->
8936189358
<result>
8936289359
<kind>65536</kind>
@@ -89376,9 +89373,8 @@
8937689373
<cols>1</cols>
8937789374
<dt>"2f"</dt>
8937889375
<data>
89379-
9.99500046e+001 0. 9.99500046e+001 1.57079637e+000
89380-
1.99949997e+002 0. 1.99949997e+002 1.57079637e+000
89381-
3.99950012e+002 0. 3.99950012e+002 1.57079637e+000</data></val></result></OCL_HoughLinesFixture_HoughLines--HoughLines---3840x2160--0-1--0-0174533->
89376+
100. 0. 100. 1.57079637 200. 0. 200. 1.57079637 400. 0. 400.
89377+
1.57079637</data></val></result></OCL_HoughLinesFixture_HoughLines--HoughLines---3840x2160--0-1--0-0174533->
8938289378
<OCL_HoughLinesFixture_HoughLines--HoughLines---3840x2160--0-1--0-1->
8938389379
<result>
8938489380
<kind>65536</kind>
@@ -89388,7 +89384,7 @@
8938889384
<cols>1</cols>
8938989385
<dt>"2f"</dt>
8939089386
<data>
89391-
9.99500046e+001 0. 1.99949997e+002 0. 3.99950012e+002 0.</data></val></result></OCL_HoughLinesFixture_HoughLines--HoughLines---3840x2160--0-1--0-1->
89387+
100. 0. 200. 0. 400. 0.</data></val></result></OCL_HoughLinesFixture_HoughLines--HoughLines---3840x2160--0-1--0-1->
8939289388
<OCL_HoughLinesFixture_HoughLines--HoughLines---3840x2160--1--0-0174533->
8939389389
<result>
8939489390
<kind>65536</kind>
@@ -89398,8 +89394,8 @@
8939889394
<cols>1</cols>
8939989395
<dt>"2f"</dt>
8940089396
<data>
89401-
100. 0. 100. 1.57079637e+000 200. 0. 200. 1.57079637e+000 400.
89402-
0. 400. 1.57079637e+000</data></val></result></OCL_HoughLinesFixture_HoughLines--HoughLines---3840x2160--1--0-0174533->
89397+
100. 0. 100. 1.57079637 200. 0. 200. 1.57079637 400. 0. 400.
89398+
1.57079637</data></val></result></OCL_HoughLinesFixture_HoughLines--HoughLines---3840x2160--1--0-0174533->
8940389399
<OCL_HoughLinesFixture_HoughLines--HoughLines---3840x2160--1--0-1->
8940489400
<result>
8940589401
<kind>65536</kind>
@@ -89410,7 +89406,7 @@
8941089406
<dt>"2f"</dt>
8941189407
<data>
8941289408
100. 0. 200. 0. 400. 0.</data></val></result></OCL_HoughLinesFixture_HoughLines--HoughLines---3840x2160--1--0-1->
89413-
<!-- resumed -->
89409+
8941489410
<!-- resumed -->
8941589411
<MomentsFixture_val_Moments1--Moments1---640x480--CV_16U--false->
8941689412
<m>

0 commit comments

Comments
 (0)