[更新]NyARToolkit/nyatlaブランチ

diff --git a/src/jp/nyatla/nyartoolkit/core/labeling/NyARLabelingLabel.java b/src/jp/nyatla/nyartoolkit/core/labeling/NyARLabelingLabel.java
index 93ae455..28e4ef1 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/labeling/NyARLabelingLabel.java
+++ b/src/jp/nyatla/nyartoolkit/core/labeling/NyARLabelingLabel.java
@@ -41,6 +41,4 @@ public class NyARLabelingLabel
        public int clip_t;// 3\r
        public double pos_x;\r
        public double pos_y;\r
-       public int tmp_x;//最適化用\r
-       public int tmp_y;//最適化用\r
 }\r

diff --git a/src/jp/nyatla/nyartoolkit/core/labeling/NyARLabeling_ARToolKit.java b/src/jp/nyatla/nyartoolkit/core/labeling/NyARLabeling_ARToolKit.java
index 370202b..ea6ee8c 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/labeling/NyARLabeling_ARToolKit.java
+++ b/src/jp/nyatla/nyartoolkit/core/labeling/NyARLabeling_ARToolKit.java
@@ -112,12 +112,10 @@ public class NyARLabeling_ARToolKit implements INyARLabeling
                        line_ptr=raster_buf[j];\r
                        label_img_pt0 = label_img[j];\r
                        label_img_pt1 = label_img[j - 1];\r
-                       for (i = 1; i < lxsize - 1; i++) {// for(int i = 1; i < lxsize-1;\r
-                                                                                               // i++, pnt+=poff, pnt2++) {\r
+                       for (i = 1; i < lxsize - 1; i++) {// for(int i = 1; i < lxsize-1;i++, pnt+=poff, pnt2++) {\r
                                // RGBの合計値が閾値より小さいかな？\r
                                if (line_ptr[i]==0) {\r
-                                       // pnt1 = ShortPointer.wrap(pnt2, -lxsize);//pnt1 =\r
-                                       // &(pnt2[-lxsize]);\r
+                                       // pnt1 = ShortPointer.wrap(pnt2, -lxsize);//pnt1 =&(pnt2[-lxsize]);\r
                                        if (label_img_pt1[i] > 0) {// if( *pnt1 > 0 ) {\r
                                                label_pixel = label_img_pt1[i];// *pnt2 = *pnt1;\r
 \r