Skip to content

Commit f3ceba6

Browse files
asmorkalovasmorkalov
committed
Merge branch 4.x
2 parents b37cc2c + 8a2ab0a commit f3ceba6

File tree

9 files changed

+80
-0
lines changed

9 files changed

+80
-0
lines changed

‎testdata/cv/cvtcolor/bayerVNG_gold.png‎

3.37 KB
Loading

‎testdata/cv/cvtcolor_strict/bglena.png‎

1.14 KB
Loading

‎testdata/cv/cvtcolor_strict/gblena.png‎

1.1 KB
Loading

‎testdata/cv/cvtcolor_strict/grlena.png‎

1.07 KB
Loading

‎testdata/cv/cvtcolor_strict/rglena.png‎

1.21 KB
Loading

‎testdata/highgui/readwrite/033.png‎

915 Bytes
Loading

‎testdata/highgui/readwrite/034.png‎

331 Bytes
Loading

‎testdata/highgui/readwrite/035.png‎

668 Bytes
Loading

‎testdata/perf/core.xml‎

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79716,4 +79716,84 @@
7971679716
<dt>d</dt>
7971779717
<data>
7971879718
206814.52062139678</data></val></n></Size_MatType_NormType_norm_mask--norm_mask---127x61--64FC1--NORM_L2->
79719+
<!-- resumed -->
79720+
79721+
<Size_MatType_Mat_CopyToWithMask--Mat_CopyToWithMask---1920x1080--16UC3->
79722+
<dst>
79723+
<kind>65536</kind>
79724+
<type>18</type>
79725+
<min>0.</min>
79726+
<max>65535.</max>
79727+
<last>
79728+
<x>1919</x>
79729+
<y>1079</y>
79730+
<val>44827.</val></last>
79731+
<rng1>
79732+
<x>428</x>
79733+
<y>830</y>
79734+
<cn>1</cn>
79735+
<val>56025.</val></rng1>
79736+
<rng2>
79737+
<x>1326</x>
79738+
<y>153</y>
79739+
<cn>1</cn>
79740+
<val>22581.</val></rng2></dst></Size_MatType_Mat_CopyToWithMask--Mat_CopyToWithMask---1920x1080--16UC3->
79741+
<Size_MatType_Mat_CopyToWithMask--Mat_CopyToWithMask---1920x1080--32SC2->
79742+
<dst>
79743+
<kind>65536</kind>
79744+
<type>12</type>
79745+
<min>-2147482865.</min>
79746+
<max>2147482988.</max>
79747+
<last>
79748+
<x>1919</x>
79749+
<y>1079</y>
79750+
<val>1367426877.</val></last>
79751+
<rng1>
79752+
<x>1541</x>
79753+
<y>1011</y>
79754+
<cn>1</cn>
79755+
<val>-828002990.</val></rng1>
79756+
<rng2>
79757+
<x>526</x>
79758+
<y>84</y>
79759+
<val>1827645499.</val></rng2></dst></Size_MatType_Mat_CopyToWithMask--Mat_CopyToWithMask---1920x1080--32SC2->
79760+
<Size_MatType_Mat_CopyToWithMask--Mat_CopyToWithMask---127x61--16UC3->
79761+
<dst>
79762+
<kind>65536</kind>
79763+
<type>18</type>
79764+
<min>0.</min>
79765+
<max>65535.</max>
79766+
<last>
79767+
<x>126</x>
79768+
<y>60</y>
79769+
<val>47427.</val></last>
79770+
<rng1>
79771+
<x>34</x>
79772+
<y>60</y>
79773+
<cn>2</cn>
79774+
<val>4093.</val></rng1>
79775+
<rng2>
79776+
<x>9</x>
79777+
<y>46</y>
79778+
<cn>1</cn>
79779+
<val>9660.</val></rng2></dst></Size_MatType_Mat_CopyToWithMask--Mat_CopyToWithMask---127x61--16UC3->
79780+
<Size_MatType_Mat_CopyToWithMask--Mat_CopyToWithMask---127x61--32SC2->
79781+
<dst>
79782+
<kind>65536</kind>
79783+
<type>12</type>
79784+
<min>-2147020120.</min>
79785+
<max>2147377472.</max>
79786+
<last>
79787+
<x>126</x>
79788+
<y>60</y>
79789+
<val>-1638256053.</val></last>
79790+
<rng1>
79791+
<x>14</x>
79792+
<y>41</y>
79793+
<cn>1</cn>
79794+
<val>-160794729.</val></rng1>
79795+
<rng2>
79796+
<x>15</x>
79797+
<y>53</y>
79798+
<val>1576696853.</val></rng2></dst></Size_MatType_Mat_CopyToWithMask--Mat_CopyToWithMask---127x61--32SC2->
7971979799
</opencv_storage>

0 commit comments

Comments
 (0)