[更新]NyARToolkit/nyatlaブランチ-2.0.0候補

diff --git a/src/jp/nyatla/nyartoolkit/core/NyARSquareDetector.java b/src/jp/nyatla/nyartoolkit/core/NyARSquareDetector.java
index 0d64a67..5ffcb5f 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/NyARSquareDetector.java
+++ b/src/jp/nyatla/nyartoolkit/core/NyARSquareDetector.java
@@ -190,7 +190,7 @@ public class NyARSquareDetector implements INyARSquareDetector
                        normalizeCoord(xcoord, ycoord, vertex1, coord_num);\r
 \r
                        // 領域を準備する。\r
-                       NyARSquare square_ptr = o_square_stack.prePush();\r
+                       NyARSquare square_ptr = (NyARSquare)o_square_stack.prePush();\r
 \r
                        // 頂点情報を取得\r
                        if (!getSquareVertex(xcoord, ycoord, vertex1, coord_num, label_area, mkvertex)) {\r

diff --git a/src/jp/nyatla/nyartoolkit/core/NyARSquareStack.java b/src/jp/nyatla/nyartoolkit/core/NyARSquareStack.java
index 44a63d1..a88109a 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/NyARSquareStack.java
+++ b/src/jp/nyatla/nyartoolkit/core/NyARSquareStack.java
@@ -48,9 +48,4 @@ public class NyARSquareStack extends NyObjectStack
                        i_buffer[i] = new NyARSquare();\r
                }\r
        }\r
-\r
-       public NyARSquare prePush() throws NyARException\r
-       {\r
-               return (NyARSquare) super.prePush();\r
-       }\r
 }\r

diff --git a/src/jp/nyatla/nyartoolkit/core/labeling/NyARLabelingLabelStack.java b/src/jp/nyatla/nyartoolkit/core/labeling/NyARLabelingLabelStack.java
index f405a2e..0ed1c0b 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/labeling/NyARLabelingLabelStack.java
+++ b/src/jp/nyatla/nyartoolkit/core/labeling/NyARLabelingLabelStack.java
@@ -56,10 +56,6 @@ public class NyARLabelingLabelStack extends NyObjectStack
                }\r
        }\r
 \r
-       public NyARLabelingLabel prePush() throws NyARException\r
-       {\r
-               return (NyARLabelingLabel) super.prePush();\r
-       }\r
        /**\r
         * エリアの大きい順にラベルをソートします。\r
         */\r

diff --git a/src/jp/nyatla/nyartoolkit/core/types/stack/NyARIntPointStack.java b/src/jp/nyatla/nyartoolkit/core/types/stack/NyARIntPointStack.java
index e260789..e0c5b93 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/types/stack/NyARIntPointStack.java
+++ b/src/jp/nyatla/nyartoolkit/core/types/stack/NyARIntPointStack.java
@@ -50,9 +50,4 @@ public class NyARIntPointStack extends NyObjectStack
                }\r
        }\r
 \r
-\r
-       public NyARIntPoint prePush() throws NyARException\r
-       {\r
-               return (NyARIntPoint) super.prePush();\r
-       }\r
 }\r

diff --git a/src/jp/nyatla/nyartoolkit/core/types/stack/NyARIntRectStack.java b/src/jp/nyatla/nyartoolkit/core/types/stack/NyARIntRectStack.java
index eb688bc..ae8ce84 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/types/stack/NyARIntRectStack.java
+++ b/src/jp/nyatla/nyartoolkit/core/types/stack/NyARIntRectStack.java
@@ -49,10 +49,4 @@ public class NyARIntRectStack extends NyObjectStack
                        i_buffer[i] = new NyARIntRect();\r
                }\r
        }\r
-\r
-\r
-       public NyARIntRect prePush() throws NyARException\r
-       {\r
-               return (NyARIntRect) super.prePush();\r
-       }\r
 }\r

diff --git a/src/jp/nyatla/nyartoolkit/core2/rasteranalyzer/NyARRasterDetector_QrCodeEdge.java b/src/jp/nyatla/nyartoolkit/core2/rasteranalyzer/NyARRasterDetector_QrCodeEdge.java
index 3d06011..53cf6f7 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core2/rasteranalyzer/NyARRasterDetector_QrCodeEdge.java
+++ b/src/jp/nyatla/nyartoolkit/core2/rasteranalyzer/NyARRasterDetector_QrCodeEdge.java
@@ -251,7 +251,7 @@ public class NyARRasterDetector_QrCodeEdge
                                        break;\r
                                case 10:\r
                                        /* コード特定→保管 */\r
-                                       item = this._result.prePush();\r
+                                       item = (NyARIntRect)this._result.prePush();\r
                                        item.x = x;\r
                                        item.y = y;\r
                                        item.w =s_pos-x;\r

diff --git a/src/jp/nyatla/utils/NyObjectStack.java b/src/jp/nyatla/utils/NyObjectStack.java
index e494cc1..ccb4998 100644 (file)
--- a/src/jp/nyatla/utils/NyObjectStack.java
+++ b/src/jp/nyatla/utils/NyObjectStack.java
@@ -65,7 +65,7 @@ public abstract class NyObjectStack
         * ポインタを1進めて、その要素を予約し、その要素へのポインタを返します。\r
         * 特定型に依存させるときには、継承したクラスでこの関数をオーバーライドしてください。\r
         */\r
-       public Object prePush() throws NyARException\r
+       public final Object prePush() throws NyARException\r
        {\r
                // 必要に応じてアロケート\r
                if (this._length >= this._allocated_size) {\r