[update]nyartoolkit

+NyARDoubleMatrix34にsetValue関数(2)を追加
+SingleMarkerProcessorのsetConfidenceThreshold関数の引数ミスを修正
+

git-svn-id: http://svn.sourceforge.jp/svnroot/nyartoolkit/NyARToolkit@415 7cac0a50-4618-4814-88d0-24b83990f816

diff --git a/trunk/src/jp/nyatla/nyartoolkit/core/types/matrix/NyARDoubleMatrix34.java b/trunk/src/jp/nyatla/nyartoolkit/core/types/matrix/NyARDoubleMatrix34.java
index db76cf3..1f05cf9 100644 (file)
--- a/trunk/src/jp/nyatla/nyartoolkit/core/types/matrix/NyARDoubleMatrix34.java
+++ b/trunk/src/jp/nyatla/nyartoolkit/core/types/matrix/NyARDoubleMatrix34.java
@@ -54,6 +54,22 @@ public class NyARDoubleMatrix34 implements INyARDoubleMatrix
                this.m23=i_value[11];\r
                return;\r
        }\r
+       public void setValue(NyARDoubleMatrix34 i_value)\r
+       {\r
+               this.m00=i_value.m00;\r
+               this.m01=i_value.m01;\r
+               this.m02=i_value.m02;\r
+               this.m03=i_value.m03;\r
+               this.m10=i_value.m10;\r
+               this.m11=i_value.m11;\r
+               this.m12=i_value.m12;\r
+               this.m13=i_value.m13;\r
+               this.m20=i_value.m20;\r
+               this.m21=i_value.m21;\r
+               this.m22=i_value.m22;\r
+               this.m23=i_value.m23;\r
+               return;\r
+       }\r
        public void getValue(double[] o_value)\r
        {\r
                o_value[0]=this.m00;\r

diff --git a/trunk/src/jp/nyatla/nyartoolkit/processor/SingleARMarkerProcesser.java b/trunk/src/jp/nyatla/nyartoolkit/processor/SingleARMarkerProcesser.java
index db59b2f..e4ad302 100644 (file)
--- a/trunk/src/jp/nyatla/nyartoolkit/processor/SingleARMarkerProcesser.java
+++ b/trunk/src/jp/nyatla/nyartoolkit/processor/SingleARMarkerProcesser.java
@@ -303,7 +303,7 @@ public abstract class SingleARMarkerProcesser
         * @param i_new_detect_cf\r
         * @param i_exist_detect_cf\r
         */\r
-       public void setConfidenceThreshold(int i_new_cf,double i_exist_cf)\r
+       public void setConfidenceThreshold(double i_new_cf,double i_exist_cf)\r
        {\r
                this._detectmarker_cb.cf_threshold_exist=i_exist_cf;\r
                this._detectmarker_cb.cf_threshold_new=i_new_cf;\r