third_party/opencv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/3.4' into merge-3.4

Browse Source
This commit is contained in:
Alexander Alekhin
2020-05-18 17:50:16 +00:00
parent 5ecf5f106a 322960f795
commit 593af7287b
28 changed files with 375 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/java/generator/src/java/org/opencv/utils/Converters.java
+6 -12
View File
@@ -519,8 +519,7 @@ public class Converters {
Mat res;
int lCount = (pts != null) ? pts.size() : 0;
if (lCount > 0) {
for (MatOfPoint vpt : pts)
mats.add(vpt);
mats.addAll(pts);
res = vector_Mat_to_Mat(mats);
} else {
res = new Mat();
@@ -568,8 +567,7 @@ public class Converters {
Mat res;
int lCount = (pts != null) ? pts.size() : 0;
if (lCount > 0) {
for (MatOfPoint2f vpt : pts)
mats.add(vpt);
mats.addAll(pts);
res = vector_Mat_to_Mat(mats);
} else {
res = new Mat();
@@ -600,8 +598,7 @@ public class Converters {
Mat res;
int lCount = (pts != null) ? pts.size() : 0;
if (lCount > 0) {
for (MatOfPoint3f vpt : pts)
mats.add(vpt);
mats.addAll(pts);
res = vector_Mat_to_Mat(mats);
} else {
res = new Mat();
@@ -614,8 +611,7 @@ public class Converters {
Mat res;
int lCount = (kps != null) ? kps.size() : 0;
if (lCount > 0) {
for (MatOfKeyPoint vkp : kps)
mats.add(vkp);
mats.addAll(kps);
res = vector_Mat_to_Mat(mats);
} else {
res = new Mat();
@@ -714,8 +710,7 @@ public class Converters {
Mat res;
int lCount = (lvdm != null) ? lvdm.size() : 0;
if (lCount > 0) {
for (MatOfDMatch vdm : lvdm)
mats.add(vdm);
mats.addAll(lvdm);
res = vector_Mat_to_Mat(mats);
} else {
res = new Mat();
@@ -746,8 +741,7 @@ public class Converters {
Mat res;
int lCount = (lvb != null) ? lvb.size() : 0;
if (lCount > 0) {
for (MatOfByte vb : lvb)
mats.add(vb);
mats.addAll(lvb);
res = vector_Mat_to_Mat(mats);
} else {
res = new Mat();