Added setters to Java API

diff --git a/modules/java/src/java/Point.java b/modules/java/src/java/Point.java
index 3d948ab..3fb0923 100644 (file)
--- a/modules/java/src/java/Point.java
+++ b/modules/java/src/java/Point.java
@@ -15,12 +15,19 @@ public class Point {
     }\r
 \r
     public Point(double[] vals) {\r
-       this();\r
-       if(vals!=null) {\r
-               x = vals.length>0 ? vals[0] : 0;\r
-               y = vals.length>1 ? vals[1] : 0;\r
-       }\r
+        this();\r
+        set(vals);\r
     }\r
+    public void set(double[] vals) {\r
+        if(vals!=null) {\r
+            x = vals.length>0 ? vals[0] : 0;\r
+            y = vals.length>1 ? vals[1] : 0;\r
+        } else {\r
+            x = 0;\r
+            y = 0;\r
+       }\r
+    }\r
+\r
 \r
     public Point clone() {\r
         return new Point(x, y);\r

diff --git a/modules/java/src/java/Point3.java b/modules/java/src/java/Point3.java
index 8f4e468..f77d7f6 100644 (file)
--- a/modules/java/src/java/Point3.java
+++ b/modules/java/src/java/Point3.java
@@ -22,12 +22,19 @@ public class Point3 {
     }\r
 \r
     public Point3(double[] vals) {\r
-       this();\r
-       if(vals!=null) {\r
-               x = vals.length>0 ? vals[0] : 0;\r
-               y = vals.length>1 ? vals[1] : 0;\r
-               z = vals.length>2 ? vals[2] : 0;\r
-       }\r
+        this();\r
+        set(vals);\r
+    }\r
+    public void set(double[] vals) {\r
+        if(vals!=null) {\r
+            x = vals.length>0 ? vals[0] : 0;\r
+            y = vals.length>1 ? vals[1] : 0;\r
+            z = vals.length>2 ? vals[2] : 0;\r
+        } else {\r
+            x = 0;\r
+            y = 0;\r
+            z = 0;\r
+       }\r
     }\r
 \r
     public Point3 clone() {\r

diff --git a/modules/java/src/java/Range.java b/modules/java/src/java/Range.java
index e4db9c4..03b6dc7 100644 (file)
--- a/modules/java/src/java/Range.java
+++ b/modules/java/src/java/Range.java
@@ -2,67 +2,81 @@ package org.opencv;
 \r
 //javadoc:Range\r
 public class Range {\r
-       \r
-       public int start, end;\r
+    \r
+    public int start, end;\r
 \r
-       public Range(int s, int e) {\r
-               this.start = s;\r
-               this.end = e;\r
-       }\r
+    public Range(int s, int e) {\r
+        this.start = s;\r
+        this.end = e;\r
+    }\r
 \r
-       public Range() {\r
-               this(0, 0);\r
+    public Range() {\r
+        this(0, 0);\r
+    }\r
+    public Range(double[] vals) {\r
+        this();\r
+        set(vals);\r
+    }\r
+    public void set(double[] vals) {\r
+        if(vals!=null) {\r
+            start = vals.length>0 ? (int)vals[0] : 0;\r
+            end   = vals.length>1 ? (int)vals[1] : 0;\r
+        } else {\r
+            start = 0;\r
+            end   = 0;\r
        }\r
 \r
-       public int size() {\r
-               return end-start;\r
-       }\r
+    }\r
 \r
-       public boolean empty() {\r
-               return start==end;\r
-       }\r
+    public int size() {\r
+        return end-start;\r
+    }\r
 \r
-       public static Range all() {\r
-               return new Range(Integer.MIN_VALUE , Integer.MAX_VALUE);\r
-       }\r
+    public boolean empty() {\r
+        return start==end;\r
+    }\r
 \r
-       public Range intersection(Range r1) {\r
-               Range r = new Range(Math.max(r1.start, this.start), Math.min(r1.end, this.end));\r
-               r.end = Math.max(r.end, r.start);\r
-               return r;\r
-       }\r
-       public Range shift(int delta) {\r
-               return new Range(start+delta, end+delta);\r
-       }\r
-       \r
-       \r
-       public Range clone() {\r
-               return new Range(start, end);\r
-       }\r
-       \r
-       @Override\r
-       public int hashCode() {\r
-               final int prime = 31;\r
-               int result = 1;\r
-               long temp;\r
-               temp = Double.doubleToLongBits(start);\r
-               result = prime * result + (int) (temp ^ (temp >>> 32));\r
-               temp = Double.doubleToLongBits(end);\r
-               result = prime * result + (int) (temp ^ (temp >>> 32));\r
-               return result;\r
-       }\r
+    public static Range all() {\r
+        return new Range(Integer.MIN_VALUE , Integer.MAX_VALUE);\r
+    }\r
 \r
-       @Override\r
-       public boolean equals(Object obj) {\r
-               if (this == obj) return true;\r
-               if (!(obj instanceof Range)) return false;\r
-               Range it = (Range) obj;\r
-               return start == it.start && end == it.end;\r
-       }\r
+    public Range intersection(Range r1) {\r
+        Range r = new Range(Math.max(r1.start, this.start), Math.min(r1.end, this.end));\r
+        r.end = Math.max(r.end, r.start);\r
+        return r;\r
+    }\r
+    public Range shift(int delta) {\r
+        return new Range(start+delta, end+delta);\r
+    }\r
+    \r
+    \r
+    public Range clone() {\r
+        return new Range(start, end);\r
+    }\r
+    \r
+    @Override\r
+    public int hashCode() {\r
+        final int prime = 31;\r
+        int result = 1;\r
+        long temp;\r
+        temp = Double.doubleToLongBits(start);\r
+        result = prime * result + (int) (temp ^ (temp >>> 32));\r
+        temp = Double.doubleToLongBits(end);\r
+        result = prime * result + (int) (temp ^ (temp >>> 32));\r
+        return result;\r
+    }\r
 \r
-       @Override\r
-       public String toString() {\r
-               if (this == null) return "null";\r
-               return "[" + start + ", " + end + ")";\r
-       }\r
+    @Override\r
+    public boolean equals(Object obj) {\r
+        if (this == obj) return true;\r
+        if (!(obj instanceof Range)) return false;\r
+        Range it = (Range) obj;\r
+        return start == it.start && end == it.end;\r
+    }\r
+\r
+    @Override\r
+    public String toString() {\r
+        if (this == null) return "null";\r
+        return "[" + start + ", " + end + ")";\r
+    }\r
 }\r

diff --git a/modules/java/src/java/Rect.java b/modules/java/src/java/Rect.java
index abb2d9e..e6caf36 100644 (file)
--- a/modules/java/src/java/Rect.java
+++ b/modules/java/src/java/Rect.java
@@ -28,13 +28,21 @@ public class Rect {
     }\r
 \r
     public Rect(double[] vals) {\r
-       this();\r
-       if(vals!=null) {\r
-               x      = vals.length>0 ? (int)vals[0] : 0;\r
-               y      = vals.length>1 ? (int)vals[1] : 0;\r
-               width  = vals.length>2 ? (int)vals[2] : 0;\r
-               height = vals.length>3 ? (int)vals[3] : 0;\r
-       }\r
+        this();\r
+        set(vals);\r
+    }\r
+    public void set(double[] vals) {\r
+        if(vals!=null) {\r
+            x      = vals.length>0 ? (int)vals[0] : 0;\r
+            y      = vals.length>1 ? (int)vals[1] : 0;\r
+            width  = vals.length>2 ? (int)vals[2] : 0;\r
+            height = vals.length>3 ? (int)vals[3] : 0;\r
+        } else {\r
+            x      = 0;\r
+            y      = 0;\r
+            width  = 0;\r
+            height = 0;\r
+       }\r
     }\r
 \r
     public Rect clone() {\r

diff --git a/modules/java/src/java/RotatedRect.java b/modules/java/src/java/RotatedRect.java
index 1d27f28..c86042f 100644 (file)
--- a/modules/java/src/java/RotatedRect.java
+++ b/modules/java/src/java/RotatedRect.java
@@ -18,14 +18,23 @@ public class RotatedRect {
     }\r
 \r
     public RotatedRect(double[] vals) {\r
-       this();\r
-       if(vals!=null) {\r
-               center.x    = vals.length>0 ? (int)vals[0] : 0;\r
-               center.x    = vals.length>1 ? (int)vals[1] : 0;\r
-               size.width  = vals.length>2 ? (int)vals[2] : 0;\r
-               size.height = vals.length>3 ? (int)vals[3] : 0;\r
-               angle       = vals.length>4 ? (int)vals[4] : 0;\r
-       }\r
+        this();\r
+        set(vals);\r
+    }\r
+    public void set(double[] vals) {\r
+        if(vals!=null) {\r
+            center.x    = vals.length>0 ? (int)vals[0] : 0;\r
+            center.x    = vals.length>1 ? (int)vals[1] : 0;\r
+            size.width  = vals.length>2 ? (int)vals[2] : 0;\r
+            size.height = vals.length>3 ? (int)vals[3] : 0;\r
+            angle       = vals.length>4 ? (int)vals[4] : 0;\r
+        } else {\r
+            center.x    = 0;\r
+            center.x    = 0;\r
+            size.width  = 0;\r
+            size.height = 0;\r
+            angle       = 0;\r
+        }\r
     }\r
 \r
     public void points(Point pt[])\r

diff --git a/modules/java/src/java/Scalar.java b/modules/java/src/java/Scalar.java
index f5d7ed7..6bb0f18 100644 (file)
--- a/modules/java/src/java/Scalar.java
+++ b/modules/java/src/java/Scalar.java
@@ -25,12 +25,20 @@ public class Scalar {
     }\r
 \r
     public Scalar(double[] vals) {\r
-       if(vals!=null) {\r
-               v0 = vals.length>0 ? (int)vals[0] : 0;\r
-               v1 = vals.length>1 ? (int)vals[1] : 0;\r
-               v2 = vals.length>2 ? (int)vals[2] : 0;\r
-               v3 = vals.length>3 ? (int)vals[3] : 0;\r
-       }\r
+        set(vals);\r
+    }\r
+    public void set(double[] vals) {\r
+        if(vals!=null) {\r
+            v0 = vals.length>0 ? (int)vals[0] : 0;\r
+            v1 = vals.length>1 ? (int)vals[1] : 0;\r
+            v2 = vals.length>2 ? (int)vals[2] : 0;\r
+            v3 = vals.length>3 ? (int)vals[3] : 0;\r
+        } else {\r
+            v0 = 0;\r
+            v1 = 0;\r
+            v2 = 0;\r
+            v3 = 0;\r
+        }\r
     }\r
 \r
     public static Scalar all(double v) {\r

diff --git a/modules/java/src/java/Size.java b/modules/java/src/java/Size.java
index ed7badb..3839594 100644 (file)
--- a/modules/java/src/java/Size.java
+++ b/modules/java/src/java/Size.java
@@ -20,11 +20,17 @@ public class Size {
     }\r
 \r
     public Size(double[] vals) {\r
-       this();\r
-       if(vals!=null) {\r
-               width  = vals.length>0 ? vals[0] : 0;\r
-               height = vals.length>1 ? vals[1] : 0;\r
-       }\r
+        this();\r
+        set(vals);\r
+    }\r
+    public void set(double[] vals) {\r
+        if(vals!=null) {\r
+            width  = vals.length>0 ? vals[0] : 0;\r
+            height = vals.length>1 ? vals[1] : 0;\r
+        } else {\r
+            width  = 0;\r
+            height = 0;\r
+        }\r
     }\r
 \r
     public double area() {\r

diff --git a/modules/java/src/java/TermCriteria.java b/modules/java/src/java/TermCriteria.java
index 855137e..e7e3766 100644 (file)
--- a/modules/java/src/java/TermCriteria.java
+++ b/modules/java/src/java/TermCriteria.java
@@ -18,12 +18,19 @@ public class TermCriteria {
     }\r
 \r
     public TermCriteria(double[] vals) {\r
-       this();\r
-       if(vals!=null) {\r
-               type      = vals.length>0 ? (int)vals[0]    : 0;\r
-               maxCount  = vals.length>1 ? (int)vals[1]    : 0;\r
-               epsilon   = vals.length>2 ? (double)vals[2] : 0;\r
-       }\r
+        this();\r
+        set(vals);\r
+    }\r
+    public void set(double[] vals) {\r
+        if(vals!=null) {\r
+            type      = vals.length>0 ? (int)vals[0]    : 0;\r
+            maxCount  = vals.length>1 ? (int)vals[1]    : 0;\r
+            epsilon   = vals.length>2 ? (double)vals[2] : 0;\r
+        } else {\r
+            type      = 0;\r
+            maxCount  = 0;\r
+            epsilon   = 0;\r
+        }\r
     }\r
 \r
     public TermCriteria clone() {\r