mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-12 20:42:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #17248 from nroduit:java-addall

Browse Source
This commit is contained in:
Alexander Alekhin 2020-05-14 12:17:51 +00:00
commit ea3c2307dc
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
modules/java/generator/src/java/org/opencv/utils/Converters.java
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();