potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 15:23:05 +04:00
Code Packages Releases Wiki Activity

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

Browse Source
This commit is contained in:
Alexander Alekhin
2019-08-05 18:11:43 +00:00
parent 0757a51e2b 90ccd2f37c
commit 174b4ce29d
41 changed files with 423 additions and 302 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/core/misc/java/src/java/core+Mat.java
+5 -2
View File
@@ -735,8 +735,11 @@ public class Mat {
// javadoc:Mat::toString()
@Override
public String toString() {
return "Mat [ " +
rows() + "*" + cols() + "*" + CvType.typeToString(type()) +
String _dims = (dims() > 0) ? "" : "-1*-1*";
for (int i=0; i<dims(); i++) {
_dims += size(i) + "*";
}
return "Mat [ " + _dims + CvType.typeToString(type()) +
", isCont=" + isContinuous() + ", isSubmat=" + isSubmatrix() +
", nativeObj=0x" + Long.toHexString(nativeObj) +
", dataAddr=0x" + Long.toHexString(dataAddr()) +