[Backup]NyARToolkit for Java

基本部分の最適化ed

diff --git a/sample/sandbox/jp/nyatla/nyartoolkit/sandbox/qrcode/NyARQrCodeDetector.java b/sample/sandbox/jp/nyatla/nyartoolkit/sandbox/qrcode/NyARQrCodeDetector.java
index 31a3bd5..ca7e70a 100644 (file)
--- a/sample/sandbox/jp/nyatla/nyartoolkit/sandbox/qrcode/NyARQrCodeDetector.java
+++ b/sample/sandbox/jp/nyatla/nyartoolkit/sandbox/qrcode/NyARQrCodeDetector.java
@@ -1,7 +1,6 @@
 package jp.nyatla.nyartoolkit.sandbox.qrcode;\r
 \r
 import jp.nyatla.nyartoolkit.NyARException;\r
-import jp.nyatla.nyartoolkit.core.NyARVertexCounter;\r
 import jp.nyatla.nyartoolkit.core.labeling.artoolkit.NyARLabelingImage;\r
 import jp.nyatla.nyartoolkit.core.labeling.artoolkit.NyARLabelingLabel;\r
 import jp.nyatla.nyartoolkit.core.labeling.artoolkit.NyARLabelingLabelStack;\r
@@ -12,6 +11,7 @@ import jp.nyatla.nyartoolkit.core.raster.NyARBinRaster;
 import jp.nyatla.nyartoolkit.core.squaredetect.INyARSquareDetector;\r
 import jp.nyatla.nyartoolkit.core.squaredetect.NyARSquare;\r
 import jp.nyatla.nyartoolkit.core.squaredetect.NyARSquareStack;\r
+import jp.nyatla.nyartoolkit.core.squaredetect.NyARVertexCounter;\r
 import jp.nyatla.nyartoolkit.core.types.*;\r
 import jp.nyatla.nyartoolkit.core.types.matrix.NyARDoubleMatrix22;\r
 \r

diff --git a/sample/sandbox/jp/nyatla/nyartoolkit/sandbox/quadx2/NyARSquareDetector_Quad.java b/sample/sandbox/jp/nyatla/nyartoolkit/sandbox/quadx2/NyARSquareDetector_Quad.java
index 5bc4185..0b11b44 100644 (file)
--- a/sample/sandbox/jp/nyatla/nyartoolkit/sandbox/quadx2/NyARSquareDetector_Quad.java
+++ b/sample/sandbox/jp/nyatla/nyartoolkit/sandbox/quadx2/NyARSquareDetector_Quad.java
@@ -39,6 +39,7 @@ import jp.nyatla.nyartoolkit.core.raster.*;
 import jp.nyatla.nyartoolkit.core.squaredetect.INyARSquareDetector;\r
 import jp.nyatla.nyartoolkit.core.squaredetect.NyARSquare;\r
 import jp.nyatla.nyartoolkit.core.squaredetect.NyARSquareStack;\r
+import jp.nyatla.nyartoolkit.core.squaredetect.NyARVertexCounter;\r
 import jp.nyatla.nyartoolkit.core.types.*;\r
 import jp.nyatla.nyartoolkit.core.param.*;\r
 \r

diff --git a/src/jp/nyatla/nyartoolkit/core/labeling/LabelOverlapChecker.java b/src/jp/nyatla/nyartoolkit/core/labeling/LabelOverlapChecker.java
index 25f61fe..6d7ca11 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/labeling/LabelOverlapChecker.java
+++ b/src/jp/nyatla/nyartoolkit/core/labeling/LabelOverlapChecker.java
@@ -49,7 +49,7 @@ public class LabelOverlapChecker<T extends NyARLabelInfo>
        public LabelOverlapChecker(int i_max_label,Class<T> i_element_type)\r
        {\r
                this._element_type=i_element_type;\r
-               this._labels = (T[])Array.newInstance(i_element_type, 32);\r
+               this._labels = (T[])Array.newInstance(i_element_type, i_max_label);\r
        }\r
 \r
        /**\r

diff --git a/src/jp/nyatla/nyartoolkit/core/labeling/rlelabeling/NyARLabeling_Rle.java b/src/jp/nyatla/nyartoolkit/core/labeling/rlelabeling/NyARLabeling_Rle.java
index a6cc58d..e01843c 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/labeling/rlelabeling/NyARLabeling_Rle.java
+++ b/src/jp/nyatla/nyartoolkit/core/labeling/rlelabeling/NyARLabeling_Rle.java
@@ -224,9 +224,6 @@ public class NyARLabeling_Rle
                                                final int prev_id =rle_prev[index_prev].fid;\r
                                                RleLabelFragmentInfoStack.RleLabelFragmentInfo prev_ptr = f_array[prev_id];\r
                                                if (id != prev_id){\r
-                                                       if(prev_ptr.area==0){\r
-                                                               System.out.println("ERRRR");\r
-                                                       }\r
                                                        label_count--;\r
                                                        //prevとcurrentのフラグメントidを書き換える。\r
                                                        for(int i2=index_prev;i2<len_prev;i2++){\r

diff --git a/src/jp/nyatla/nyartoolkit/core/squaredetect/NyARSquareDetector_ARToolKit.java b/src/jp/nyatla/nyartoolkit/core/squaredetect/NyARSquareDetector_ARToolKit.java
index 82a50b0..2dae3eb 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/squaredetect/NyARSquareDetector_ARToolKit.java
+++ b/src/jp/nyatla/nyartoolkit/core/squaredetect/NyARSquareDetector_ARToolKit.java
@@ -39,8 +39,6 @@ public class NyARSquareDetector_ARToolKit implements INyARSquareDetector
        {\r
                this._width = i_size.w;\r
                this._height = i_size.h;\r
-               //歪み計算テーブルを作ると、8*width/height*2の領域を消費します。\r
-               //領域を取りたくない場合は、i_dist_factor_refの値をそのまま使ってください。\r
                this._labeling = new NyARLabeling_ARToolKit();\r
                this._sqconvertor=new SquareContourDetector(i_size,i_dist_factor_ref);\r
                this._limage = new NyARLabelingImage(this._width, this._height);\r

diff --git a/src/jp/nyatla/nyartoolkit/core/NyARVertexCounter.java b/src/jp/nyatla/nyartoolkit/core/squaredetect/NyARVertexCounter.java
similarity index 95%
rename from src/jp/nyatla/nyartoolkit/core/NyARVertexCounter.java
rename to src/jp/nyatla/nyartoolkit/core/squaredetect/NyARVertexCounter.java
index c4a4009..832134d 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/NyARVertexCounter.java
+++ b/src/jp/nyatla/nyartoolkit/core/squaredetect/NyARVertexCounter.java
@@ -29,7 +29,7 @@
  *     <airmail(at)ebony.plala.or.jp>\r
  * \r
  */\r
-package jp.nyatla.nyartoolkit.core;\r
+package jp.nyatla.nyartoolkit.core.squaredetect;\r
 \r
 /**\r
  * get_vertex関数を切り離すためのクラス\r

diff --git a/src/jp/nyatla/nyartoolkit/core/squaredetect/SquareContourDetector.java b/src/jp/nyatla/nyartoolkit/core/squaredetect/SquareContourDetector.java
index 82b0437..9d8db11 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/squaredetect/SquareContourDetector.java
+++ b/src/jp/nyatla/nyartoolkit/core/squaredetect/SquareContourDetector.java
@@ -1,7 +1,6 @@
 package jp.nyatla.nyartoolkit.core.squaredetect;\r
 \r
 import jp.nyatla.nyartoolkit.NyARException;\r
-import jp.nyatla.nyartoolkit.core.NyARVertexCounter;\r
 import jp.nyatla.nyartoolkit.core.param.NyARCameraDistortionFactor;\r
 import jp.nyatla.nyartoolkit.core.param.NyARObserv2IdealMap;\r
 import jp.nyatla.nyartoolkit.core.pca2d.INyARPca2d;\r

diff --git a/src/jp/nyatla/nyartoolkit/nyidmarker/data/INyIdMarkerData.java b/src/jp/nyatla/nyartoolkit/nyidmarker/data/INyIdMarkerData.java
index 5f101ae..757b875 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/nyidmarker/data/INyIdMarkerData.java
+++ b/src/jp/nyatla/nyartoolkit/nyidmarker/data/INyIdMarkerData.java
@@ -1,12 +1,6 @@
 /* \r
- * PROJECT: NyARToolkit\r
+ * PROJECT: NyARToolkit(Extension)\r
  * --------------------------------------------------------------------------------\r
- * This work is based on the original ARToolKit developed by\r
- *   Hirokazu Kato\r
- *   Mark Billinghurst\r
- *   HITLab, University of Washington, Seattle\r
- * http://www.hitl.washington.edu/artoolkit/\r
- *\r
  * The NyARToolkit is Java version ARToolkit class library.\r
  * Copyright (C)2008 R.Iizuka\r
  *\r

diff --git a/src/jp/nyatla/nyartoolkit/nyidmarker/data/INyIdMarkerDataEncoder.java b/src/jp/nyatla/nyartoolkit/nyidmarker/data/INyIdMarkerDataEncoder.java
index 3c49a16..b6beeff 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/nyidmarker/data/INyIdMarkerDataEncoder.java
+++ b/src/jp/nyatla/nyartoolkit/nyidmarker/data/INyIdMarkerDataEncoder.java
@@ -1,12 +1,6 @@
 /* \r
- * PROJECT: NyARToolkit\r
+ * PROJECT: NyARToolkit(Extension)\r
  * --------------------------------------------------------------------------------\r
- * This work is based on the original ARToolKit developed by\r
- *   Hirokazu Kato\r
- *   Mark Billinghurst\r
- *   HITLab, University of Washington, Seattle\r
- * http://www.hitl.washington.edu/artoolkit/\r
- *\r
  * The NyARToolkit is Java version ARToolkit class library.\r
  * Copyright (C)2008 R.Iizuka\r
  *\r

diff --git a/src/jp/nyatla/nyartoolkit/nyidmarker/data/NyIdMarkerDataEncoder_RawBit.java b/src/jp/nyatla/nyartoolkit/nyidmarker/data/NyIdMarkerDataEncoder_RawBit.java
index 3692599..2962b69 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/nyidmarker/data/NyIdMarkerDataEncoder_RawBit.java
+++ b/src/jp/nyatla/nyartoolkit/nyidmarker/data/NyIdMarkerDataEncoder_RawBit.java
@@ -1,12 +1,6 @@
 /* \r
- * PROJECT: NyARToolkit\r
+ * PROJECT: NyARToolkit(Extension)\r
  * --------------------------------------------------------------------------------\r
- * This work is based on the original ARToolKit developed by\r
- *   Hirokazu Kato\r
- *   Mark Billinghurst\r
- *   HITLab, University of Washington, Seattle\r
- * http://www.hitl.washington.edu/artoolkit/\r
- *\r
  * The NyARToolkit is Java version ARToolkit class library.\r
  * Copyright (C)2008 R.Iizuka\r
  *\r

diff --git a/src/jp/nyatla/nyartoolkit/nyidmarker/data/NyIdMarkerData_RawBit.java b/src/jp/nyatla/nyartoolkit/nyidmarker/data/NyIdMarkerData_RawBit.java
index 3d1505d..3b99f92 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/nyidmarker/data/NyIdMarkerData_RawBit.java
+++ b/src/jp/nyatla/nyartoolkit/nyidmarker/data/NyIdMarkerData_RawBit.java
@@ -1,12 +1,6 @@
 /* \r
- * PROJECT: NyARToolkit\r
+ * PROJECT: NyARToolkit(Extension)\r
  * --------------------------------------------------------------------------------\r
- * This work is based on the original ARToolKit developed by\r
- *   Hirokazu Kato\r
- *   Mark Billinghurst\r
- *   HITLab, University of Washington, Seattle\r
- * http://www.hitl.washington.edu/artoolkit/\r
- *\r
  * The NyARToolkit is Java version ARToolkit class library.\r
  * Copyright (C)2008 R.Iizuka\r
  *\r

diff --git a/test/jp/nyatla/nyartoolkit/dev/LabelingCamera.java b/test/jp/nyatla/nyartoolkit/dev/LabelingCamera.java
index 5a18d4d..83ff9c5 100644 (file)
--- a/test/jp/nyatla/nyartoolkit/dev/LabelingCamera.java
+++ b/test/jp/nyatla/nyartoolkit/dev/LabelingCamera.java
@@ -39,6 +39,7 @@ import jp.nyatla.nyartoolkit.core.rasterfilter.rgb2bin.*;
 import jp.nyatla.nyartoolkit.core.squaredetect.INyARSquareDetector;
 import jp.nyatla.nyartoolkit.core.squaredetect.NyARSquare;
 import jp.nyatla.nyartoolkit.core.squaredetect.NyARSquareStack;
+import jp.nyatla.nyartoolkit.core.squaredetect.NyARVertexCounter;
 import jp.nyatla.nyartoolkit.core.transmat.*;
 import jp.nyatla.nyartoolkit.core.types.*;
 import jp.nyatla.nyartoolkit.core.types.matrix.NyARDoubleMatrix22;