NyARToolkit for Java

3.0.0の反映作業

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

diff --git a/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/mklib/ARTKMarkerTable.java b/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/mklib/ARTKMarkerTable.java
index 92b5996..b5a9967 100644 (file)
--- a/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/mklib/ARTKMarkerTable.java
+++ b/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/mklib/ARTKMarkerTable.java
@@ -1,4 +1,4 @@
-package jp.nyatla.nyartoolkit.dev.rpf.mklib;\r
+package jp.nyatla.nyartoolkit.rpf.mklib;\r
 \r
 import jp.nyatla.nyartoolkit.NyARException;\r
 import jp.nyatla.nyartoolkit.core.NyARCode;\r
@@ -12,7 +12,6 @@ import jp.nyatla.nyartoolkit.core.types.NyARDoublePoint2d;
 import jp.nyatla.nyartoolkit.core.types.stack.NyARObjectStack;\r
 import jp.nyatla.nyartoolkit.dev.rpf.reality.nyartk.NyARRealityTarget;\r
 import jp.nyatla.nyartoolkit.dev.rpf.realitysource.nyartk.NyARRealitySource;\r
-import jp.nyatla.nyartoolkit.dev.rpf.tracker.nyartk.status.NyARRectTargetStatus;\r
 import jp.nyatla.nyartoolkit.nyidmarker.*;\r
 import jp.nyatla.nyartoolkit.nyidmarker.data.NyIdMarkerDataEncoder_RawBit;\r
 import jp.nyatla.nyartoolkit.nyidmarker.data.NyIdMarkerData_RawBit;\r

diff --git a/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/mklib/ASyncIdMarkerTable.java b/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/mklib/ASyncIdMarkerTable.java
index 317161f..e95ffe8 100644 (file)
--- a/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/mklib/ASyncIdMarkerTable.java
+++ b/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/mklib/ASyncIdMarkerTable.java
@@ -1,12 +1,10 @@
-package jp.nyatla.nyartoolkit.dev.rpf.mklib;\r
+package jp.nyatla.nyartoolkit.rpf.mklib;\r
 \r
 import jp.nyatla.nyartoolkit.NyARException;\r
 import jp.nyatla.nyartoolkit.core.raster.rgb.NyARRgbRaster;\r
 import jp.nyatla.nyartoolkit.core.types.NyARBufferType;\r
 import jp.nyatla.nyartoolkit.core.types.NyARDoublePoint2d;\r
-import jp.nyatla.nyartoolkit.dev.rpf.reality.nyartk.NyARReality;\r
-import jp.nyatla.nyartoolkit.dev.rpf.reality.nyartk.NyARRealityTarget;\r
-import jp.nyatla.nyartoolkit.dev.rpf.realitysource.nyartk.NyARRealitySource;\r
+\r
 \r
 /**\r
  * 外部パターン認識のサンプルです。非同期にIDマーカを認識します。\r

diff --git a/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/reality/nyartk/NyARReality.java b/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/reality/nyartk/NyARReality.java
index 55c40ae..f4e2f1f 100644 (file)
--- a/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/reality/nyartk/NyARReality.java
+++ b/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/reality/nyartk/NyARReality.java
@@ -1,4 +1,4 @@
-package jp.nyatla.nyartoolkit.dev.rpf.reality.nyartk;\r
+package jp.nyatla.nyartoolkit.rpf.reality.nyartk;\r
 \r
 import jp.nyatla.nyartoolkit.NyARException;\r
 import jp.nyatla.nyartoolkit.core.param.NyARCameraDistortionFactor;\r
@@ -12,12 +12,12 @@ import jp.nyatla.nyartoolkit.core.transmat.NyARTransMat;
 import jp.nyatla.nyartoolkit.core.transmat.NyARTransMat_ARToolKit;\r
 import jp.nyatla.nyartoolkit.core.types.*;\r
 import jp.nyatla.nyartoolkit.core.types.matrix.*;\r
-import jp.nyatla.nyartoolkit.dev.rpf.realitysource.nyartk.NyARRealitySource;\r
-import jp.nyatla.nyartoolkit.dev.rpf.sampler.lrlabel.LowResolutionLabelingSampler;\r
-import jp.nyatla.nyartoolkit.dev.rpf.sampler.lrlabel.LowResolutionLabelingSamplerOut;\r
-import jp.nyatla.nyartoolkit.dev.rpf.tracker.nyartk.*;\r
-import jp.nyatla.nyartoolkit.dev.rpf.tracker.nyartk.status.NyARRectTargetStatus;\r
-import jp.nyatla.nyartoolkit.dev.rpf.tracker.nyartk.status.NyARTargetStatus;\r
+import jp.nyatla.nyartoolkit.rpf.realitysource.nyartk.NyARRealitySource;\r
+import jp.nyatla.nyartoolkit.rpf.sampler.lrlabel.LowResolutionLabelingSampler;\r
+import jp.nyatla.nyartoolkit.rpf.sampler.lrlabel.LowResolutionLabelingSamplerOut;\r
+import jp.nyatla.nyartoolkit.rpf.tracker.nyartk.*;\r
+import jp.nyatla.nyartoolkit.rpf.tracker.nyartk.status.NyARRectTargetStatus;\r
+import jp.nyatla.nyartoolkit.rpf.tracker.nyartk.status.NyARTargetStatus;\r
 \r
 \r
 \r

diff --git a/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/reality/nyartk/NyARRealityTarget.java b/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/reality/nyartk/NyARRealityTarget.java
index 60b0ccb..299ffdb 100644 (file)
--- a/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/reality/nyartk/NyARRealityTarget.java
+++ b/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/reality/nyartk/NyARRealityTarget.java
@@ -1,4 +1,4 @@
-package jp.nyatla.nyartoolkit.dev.rpf.reality.nyartk;\r
+package jp.nyatla.nyartoolkit.rpf.reality.nyartk;\r
 \r
 import jp.nyatla.nyartoolkit.NyARException;\r
 import jp.nyatla.nyartoolkit.core.raster.rgb.INyARRgbRaster;\r
@@ -11,9 +11,9 @@ import jp.nyatla.nyartoolkit.core.types.NyARIntPoint2d;
 import jp.nyatla.nyartoolkit.core.types.NyARIntRect;\r
 import jp.nyatla.nyartoolkit.core.types.matrix.NyARDoubleMatrix44;\r
 import jp.nyatla.nyartoolkit.core.utils.NyARManagedObject;\r
-import jp.nyatla.nyartoolkit.dev.rpf.realitysource.nyartk.NyARRealitySource;\r
-import jp.nyatla.nyartoolkit.dev.rpf.tracker.nyartk.NyARTarget;\r
-import jp.nyatla.nyartoolkit.dev.rpf.tracker.nyartk.status.NyARRectTargetStatus;\r
+import jp.nyatla.nyartoolkit.rpf.realitysource.nyartk.NyARRealitySource;\r
+import jp.nyatla.nyartoolkit.rpf.tracker.nyartk.NyARTarget;\r
+import jp.nyatla.nyartoolkit.rpf.tracker.nyartk.status.NyARRectTargetStatus;\r
 \r
 /**\r
  * Realityターゲットを定義します。\r

diff --git a/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/reality/nyartk/NyARRealityTargetPool.java b/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/reality/nyartk/NyARRealityTargetPool.java
index 163ea03..a66a303 100644 (file)
--- a/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/reality/nyartk/NyARRealityTargetPool.java
+++ b/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/reality/nyartk/NyARRealityTargetPool.java
@@ -1,11 +1,11 @@
-package jp.nyatla.nyartoolkit.dev.rpf.reality.nyartk;\r
+package jp.nyatla.nyartoolkit.rpf.reality.nyartk;\r
 \r
 import jp.nyatla.nyartoolkit.NyARException;\r
 import jp.nyatla.nyartoolkit.core.param.NyARPerspectiveProjectionMatrix;\r
 import jp.nyatla.nyartoolkit.core.types.NyARDoublePoint2d;\r
 import jp.nyatla.nyartoolkit.core.types.NyARDoublePoint3d;\r
 import jp.nyatla.nyartoolkit.core.utils.NyARManagedObjectPool;\r
-import jp.nyatla.nyartoolkit.dev.rpf.tracker.nyartk.NyARTarget;\r
+import jp.nyatla.nyartoolkit.rpf.tracker.nyartk.NyARTarget;\r
 \r
 public class NyARRealityTargetPool extends NyARManagedObjectPool<NyARRealityTarget>\r
 {\r

diff --git a/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/realitysource/nyartk/NyARRealitySource.java b/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/realitysource/nyartk/NyARRealitySource.java
index 6110921..177f131 100644 (file)
--- a/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/realitysource/nyartk/NyARRealitySource.java
+++ b/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/realitysource/nyartk/NyARRealitySource.java
@@ -1,28 +1,12 @@
-package jp.nyatla.nyartoolkit.dev.rpf.realitysource.nyartk;\r
-\r
-import java.awt.image.BufferedImage;\r
-\r
-import javax.media.Buffer;\r
-import javax.media.format.VideoFormat;\r
+package jp.nyatla.nyartoolkit.rpf.realitysource.nyartk;\r
 \r
 \r
 import jp.nyatla.nyartoolkit.NyARException;\r
-import jp.nyatla.nyartoolkit.core.param.NyARPerspectiveProjectionMatrix;\r
 import jp.nyatla.nyartoolkit.core.raster.rgb.INyARRgbRaster;\r
-import jp.nyatla.nyartoolkit.core.raster.rgb.NyARRgbRaster_RGB;\r
-import jp.nyatla.nyartoolkit.core.rasterfilter.rgb2gs.NyARRasterFilter_Rgb2Gs_RgbAve;\r
 import jp.nyatla.nyartoolkit.core.rasterreader.NyARPerspectiveRasterReader;\r
-import jp.nyatla.nyartoolkit.core.types.NyARBufferType;\r
-import jp.nyatla.nyartoolkit.core.types.NyARDoublePoint2d;\r
-import jp.nyatla.nyartoolkit.core.types.NyARDoublePoint3d;\r
-import jp.nyatla.nyartoolkit.core.types.NyARIntPoint2d;\r
-import jp.nyatla.nyartoolkit.core.types.matrix.NyARDoubleMatrix44;\r
-import jp.nyatla.nyartoolkit.dev.rpf.sampler.lrlabel.*;\r
-import jp.nyatla.nyartoolkit.dev.rpf.tracker.nyartk.NyARTrackerSource;\r
-import jp.nyatla.nyartoolkit.jmf.utils.JmfNyARRaster_RGB;\r
-import jp.nyatla.nyartoolkit.utils.j2se.NyARBufferedImageRaster;\r
-import jp.nyatla.nyartoolkit.utils.j2se.NyARRasterImageIO;\r
-import jp.nyatla.nyartoolkit.dev.rpf.reality.nyartk.*;\r
+import jp.nyatla.nyartoolkit.rpf.tracker.nyartk.NyARTrackerSource;\r
+\r
+import jp.nyatla.nyartoolkit.rpf.reality.nyartk.*;\r
 /**\r
  * NyARRealityクラスの入力コンテナです。\r
  * NyARRealityへ入力する情報セットを定義します。\r

diff --git a/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/realitysource/nyartk/NyARRealitySource_JavaImage.java b/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/realitysource/nyartk/NyARRealitySource_JavaImage.java
index 96db745..9904fbf 100644 (file)
--- a/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/realitysource/nyartk/NyARRealitySource_JavaImage.java
+++ b/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/realitysource/nyartk/NyARRealitySource_JavaImage.java
@@ -1,4 +1,4 @@
-package jp.nyatla.nyartoolkit.dev.rpf.realitysource.nyartk;\r
+package jp.nyatla.nyartoolkit.rpf.realitysource.nyartk;\r
 \r
 import java.awt.image.BufferedImage;\r
 \r
@@ -7,9 +7,8 @@ import jp.nyatla.nyartoolkit.core.param.NyARCameraDistortionFactor;
 import jp.nyatla.nyartoolkit.core.rasterfilter.rgb2gs.NyARRasterFilter_Rgb2Gs_RgbAve;\r
 import jp.nyatla.nyartoolkit.core.rasterreader.NyARPerspectiveRasterReader;\r
 import jp.nyatla.nyartoolkit.core.types.NyARBufferType;\r
-import jp.nyatla.nyartoolkit.dev.rpf.tracker.nyartk.NyARTrackerSource;\r
-import jp.nyatla.nyartoolkit.dev.rpf.tracker.nyartk.NyARTrackerSource_Reference;\r
-import jp.nyatla.nyartoolkit.jmf.utils.JmfNyARRaster_RGB;\r
+import jp.nyatla.nyartoolkit.rpf.tracker.nyartk.NyARTrackerSource;\r
+import jp.nyatla.nyartoolkit.rpf.tracker.nyartk.NyARTrackerSource_Reference;\r
 import jp.nyatla.nyartoolkit.utils.j2se.NyARBufferedImageRaster;\r
 \r
 /**\r

diff --git a/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/sample/Test_NyARRealityGl_IdMarker.java b/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/sample/Test_NyARRealityGl_IdMarker.java
index fd7c3ce..f980382 100644 (file)
--- a/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/sample/Test_NyARRealityGl_IdMarker.java
+++ b/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/sample/Test_NyARRealityGl_IdMarker.java
@@ -1,4 +1,4 @@
-package jp.nyatla.nyartoolkit.dev.rpf.sample;\r
+package jp.nyatla.nyartoolkit.rpf.sample;\r
 \r
 import java.awt.Color;\r
 import java.awt.Font;\r
@@ -14,10 +14,10 @@ import jp.nyatla.nyartoolkit.NyARException;
 import jp.nyatla.nyartoolkit.core.param.NyARParam;\r
 import jp.nyatla.nyartoolkit.core.types.NyARDoublePoint2d;\r
 import jp.nyatla.nyartoolkit.core.types.matrix.NyARDoubleMatrix44;\r
-import jp.nyatla.nyartoolkit.dev.rpf.mklib.RawbitSerialIdTable;\r
-import jp.nyatla.nyartoolkit.dev.rpf.reality.nyartk.NyARRealityTarget;\r
-import jp.nyatla.nyartoolkit.dev.rpf.reality.nyartk.NyARRealityTargetList;\r
-import jp.nyatla.nyartoolkit.dev.rpf.realitysource.nyartk.NyARRealitySource_Jmf;\r
+import jp.nyatla.nyartoolkit.rpf.mklib.RawbitSerialIdTable;\r
+import jp.nyatla.nyartoolkit.rpf.reality.nyartk.NyARRealityTarget;\r
+import jp.nyatla.nyartoolkit.rpf.reality.nyartk.NyARRealityTargetList;\r
+import jp.nyatla.nyartoolkit.rpf.realitysource.nyartk.NyARRealitySource_Jmf;\r
 import jp.nyatla.nyartoolkit.jmf.utils.JmfCaptureDevice;\r
 import jp.nyatla.nyartoolkit.jmf.utils.JmfCaptureDeviceList;\r
 import jp.nyatla.nyartoolkit.jmf.utils.JmfCaptureListener;\r

diff --git a/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/sample/Test_NyARRealityGl_ScreenPos.java b/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/sample/Test_NyARRealityGl_ScreenPos.java
index a9c8253..c2a867e 100644 (file)
--- a/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/sample/Test_NyARRealityGl_ScreenPos.java
+++ b/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/sample/Test_NyARRealityGl_ScreenPos.java
@@ -1,4 +1,4 @@
-package jp.nyatla.nyartoolkit.dev.rpf.sample;\r
+package jp.nyatla.nyartoolkit.rpf.sample;\r
 \r
 import java.awt.Frame;\r
 import java.awt.Insets;\r
@@ -13,10 +13,10 @@ import javax.media.opengl.*;
 import jp.nyatla.nyartoolkit.NyARException;\r
 import jp.nyatla.nyartoolkit.core.param.NyARParam;\r
 import jp.nyatla.nyartoolkit.core.types.NyARDoublePoint3d;\r
-import jp.nyatla.nyartoolkit.dev.rpf.mklib.RawbitSerialIdTable;\r
-import jp.nyatla.nyartoolkit.dev.rpf.reality.nyartk.NyARRealityTarget;\r
-import jp.nyatla.nyartoolkit.dev.rpf.reality.nyartk.NyARRealityTargetList;\r
-import jp.nyatla.nyartoolkit.dev.rpf.realitysource.nyartk.NyARRealitySource_Jmf;\r
+import jp.nyatla.nyartoolkit.rpf.mklib.RawbitSerialIdTable;\r
+import jp.nyatla.nyartoolkit.rpf.reality.nyartk.NyARRealityTarget;\r
+import jp.nyatla.nyartoolkit.rpf.reality.nyartk.NyARRealityTargetList;\r
+import jp.nyatla.nyartoolkit.rpf.realitysource.nyartk.NyARRealitySource_Jmf;\r
 import jp.nyatla.nyartoolkit.jmf.utils.JmfCaptureDevice;\r
 import jp.nyatla.nyartoolkit.jmf.utils.JmfCaptureDeviceList;\r
 import jp.nyatla.nyartoolkit.jmf.utils.JmfCaptureListener;\r

diff --git a/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/sample/Test_RealityTarget.java b/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/sample/Test_RealityTarget.java
index c4b278f..3d0ee5a 100644 (file)
--- a/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/sample/Test_RealityTarget.java
+++ b/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/sample/Test_RealityTarget.java
@@ -1,4 +1,4 @@
-package jp.nyatla.nyartoolkit.dev.rpf.sample;\r
+package jp.nyatla.nyartoolkit.rpf.sample;\r
 \r
 import java.awt.*;\r
 import java.awt.event.MouseEvent;\r
@@ -17,15 +17,15 @@ import jp.nyatla.nyartoolkit.core.types.NyARBufferType;
 import jp.nyatla.nyartoolkit.core.types.NyARDoublePoint3d;\r
 import jp.nyatla.nyartoolkit.core.types.NyARIntPoint2d;\r
 import jp.nyatla.nyartoolkit.core.types.NyARIntRect;\r
-import jp.nyatla.nyartoolkit.dev.rpf.mklib.ARTKMarkerTable;\r
-import jp.nyatla.nyartoolkit.dev.rpf.reality.nyartk.NyARReality;\r
-import jp.nyatla.nyartoolkit.dev.rpf.reality.nyartk.NyARRealityTarget;\r
-import jp.nyatla.nyartoolkit.dev.rpf.reality.nyartk.NyARRealityTargetList;\r
-import jp.nyatla.nyartoolkit.dev.rpf.realitysource.nyartk.NyARRealitySource;\r
-import jp.nyatla.nyartoolkit.dev.rpf.realitysource.nyartk.NyARRealitySource_JavaImage;\r
-import jp.nyatla.nyartoolkit.dev.rpf.realitysource.nyartk.NyARRealitySource_Jmf;\r
-import jp.nyatla.nyartoolkit.dev.rpf.tracker.nyartk.status.NyARRectTargetStatus;\r
-import jp.nyatla.nyartoolkit.dev.rpf.tracker.nyartk.status.NyARTargetStatus;\r
+import jp.nyatla.nyartoolkit.rpf.mklib.ARTKMarkerTable;\r
+import jp.nyatla.nyartoolkit.rpf.reality.nyartk.NyARReality;\r
+import jp.nyatla.nyartoolkit.rpf.reality.nyartk.NyARRealityTarget;\r
+import jp.nyatla.nyartoolkit.rpf.reality.nyartk.NyARRealityTargetList;\r
+import jp.nyatla.nyartoolkit.rpf.realitysource.nyartk.NyARRealitySource;\r
+import jp.nyatla.nyartoolkit.rpf.realitysource.nyartk.NyARRealitySource_JavaImage;\r
+import jp.nyatla.nyartoolkit.rpf.realitysource.nyartk.NyARRealitySource_Jmf;\r
+import jp.nyatla.nyartoolkit.rpf.tracker.nyartk.status.NyARRectTargetStatus;\r
+import jp.nyatla.nyartoolkit.rpf.tracker.nyartk.status.NyARTargetStatus;\r
 import jp.nyatla.nyartoolkit.jmf.utils.*;\r
 import jp.nyatla.nyartoolkit.utils.j2se.*;\r
 \r

diff --git a/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/sample/Test_TrackTerget.java b/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/sample/Test_TrackTerget.java
index 8c32f3b..dd22998 100644 (file)
--- a/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/sample/Test_TrackTerget.java
+++ b/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/sample/Test_TrackTerget.java
@@ -1,4 +1,4 @@
-package jp.nyatla.nyartoolkit.dev.rpf.sample;\r
+package jp.nyatla.nyartoolkit.rpf.sample;\r
 \r
 import java.awt.*;\r
 import java.awt.color.*;\r
@@ -30,14 +30,14 @@ import jp.nyatla.nyartoolkit.core.types.*;
 import jp.nyatla.nyartoolkit.core.raster.rgb.INyARRgbRaster;\r
 import jp.nyatla.nyartoolkit.core.raster.rgb.NyARRgbRaster_RGB;\r
 //import jp.nyatla.nyartoolkit.dev.hierarchicallabeling.tracking.AreaTargetSrcHolder.AreaSrcItem;\r
-import jp.nyatla.nyartoolkit.dev.rpf.sampler.lrlabel.*;\r
-import jp.nyatla.nyartoolkit.dev.rpf.tracker.nyartk.NyARTarget;\r
-import jp.nyatla.nyartoolkit.dev.rpf.tracker.nyartk.NyARTracker;\r
-import jp.nyatla.nyartoolkit.dev.rpf.tracker.nyartk.NyARTrackerSource_Reference;\r
-import jp.nyatla.nyartoolkit.dev.rpf.tracker.nyartk.status.NyARContourTargetStatus;\r
-import jp.nyatla.nyartoolkit.dev.rpf.tracker.nyartk.status.NyARRectTargetStatus;\r
-import jp.nyatla.nyartoolkit.dev.rpf.tracker.nyartk.status.NyARTargetStatus;\r
-import jp.nyatla.nyartoolkit.dev.rpf.utils.VecLinearCoordinatesOperator;\r
+import jp.nyatla.nyartoolkit.rpf.sampler.lrlabel.*;\r
+import jp.nyatla.nyartoolkit.rpf.tracker.nyartk.NyARTarget;\r
+import jp.nyatla.nyartoolkit.rpf.tracker.nyartk.NyARTracker;\r
+import jp.nyatla.nyartoolkit.rpf.tracker.nyartk.NyARTrackerSource_Reference;\r
+import jp.nyatla.nyartoolkit.rpf.tracker.nyartk.status.NyARContourTargetStatus;\r
+import jp.nyatla.nyartoolkit.rpf.tracker.nyartk.status.NyARRectTargetStatus;\r
+import jp.nyatla.nyartoolkit.rpf.tracker.nyartk.status.NyARTargetStatus;\r
+import jp.nyatla.nyartoolkit.rpf.utils.VecLinearCoordinatesOperator;\r
 import jp.nyatla.nyartoolkit.jmf.utils.JmfCaptureDevice;\r
 import jp.nyatla.nyartoolkit.jmf.utils.JmfCaptureDeviceList;\r
 import jp.nyatla.nyartoolkit.jmf.utils.JmfCaptureListener;\r

diff --git a/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/sampler/lrlabel/LowResolutionLabelingSampler.java b/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/sampler/lrlabel/LowResolutionLabelingSampler.java
index 08bd121..5898b26 100644 (file)
--- a/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/sampler/lrlabel/LowResolutionLabelingSampler.java
+++ b/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/sampler/lrlabel/LowResolutionLabelingSampler.java
@@ -1,4 +1,4 @@
-package jp.nyatla.nyartoolkit.dev.rpf.sampler.lrlabel;\r
+package jp.nyatla.nyartoolkit.rpf.sampler.lrlabel;\r
 \r
 import jp.nyatla.nyartoolkit.*;\r
 import jp.nyatla.nyartoolkit.core.labeling.rlelabeling.NyARLabeling_Rle;\r

diff --git a/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/sampler/lrlabel/LowResolutionLabelingSamplerOut.java b/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/sampler/lrlabel/LowResolutionLabelingSamplerOut.java
index cb9a4ff..21a23ce 100644 (file)
--- a/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/sampler/lrlabel/LowResolutionLabelingSamplerOut.java
+++ b/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/sampler/lrlabel/LowResolutionLabelingSamplerOut.java
@@ -1,4 +1,4 @@
-package jp.nyatla.nyartoolkit.dev.rpf.sampler.lrlabel;\r
+package jp.nyatla.nyartoolkit.rpf.sampler.lrlabel;\r
 \r
 import jp.nyatla.nyartoolkit.NyARException;\r
 import jp.nyatla.nyartoolkit.core.types.NyARIntPoint2d;\r

diff --git a/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/tracker/nyartk/NegativeSqRoberts.java b/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/tracker/nyartk/NegativeSqRoberts.java
index d471a0c..a182e17 100644 (file)
--- a/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/tracker/nyartk/NegativeSqRoberts.java
+++ b/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/tracker/nyartk/NegativeSqRoberts.java
@@ -22,7 +22,7 @@
  *     <airmail(at)ebony.plala.or.jp> or <nyatla(at)nyatla.jp>\r
  * \r
  */\r
-package jp.nyatla.nyartoolkit.dev.rpf.tracker.nyartk;\r
+package jp.nyatla.nyartoolkit.rpf.tracker.nyartk;\r
 \r
 import jp.nyatla.nyartoolkit.NyARException;\r
 import jp.nyatla.nyartoolkit.core.raster.*;\r

diff --git a/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/tracker/nyartk/NyARRectTargetList.java b/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/tracker/nyartk/NyARRectTargetList.java
index 056b9f6..963660f 100644 (file)
--- a/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/tracker/nyartk/NyARRectTargetList.java
+++ b/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/tracker/nyartk/NyARRectTargetList.java
@@ -1,8 +1,8 @@
-package jp.nyatla.nyartoolkit.dev.rpf.tracker.nyartk;\r
+package jp.nyatla.nyartoolkit.rpf.tracker.nyartk;\r
 \r
 import jp.nyatla.nyartoolkit.NyARException;\r
-import jp.nyatla.nyartoolkit.dev.rpf.sampler.lrlabel.*;\r
-import jp.nyatla.nyartoolkit.dev.rpf.tracker.nyartk.status.*;\r
+import jp.nyatla.nyartoolkit.rpf.sampler.lrlabel.*;\r
+import jp.nyatla.nyartoolkit.rpf.tracker.nyartk.status.*;\r
 \r
 public class NyARRectTargetList extends NyARTargetList\r
 {\r

diff --git a/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/tracker/nyartk/NyARTarget.java b/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/tracker/nyartk/NyARTarget.java
index 6d0dbe8..1ef5cd2 100644 (file)
--- a/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/tracker/nyartk/NyARTarget.java
+++ b/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/tracker/nyartk/NyARTarget.java
@@ -1,10 +1,10 @@
-package jp.nyatla.nyartoolkit.dev.rpf.tracker.nyartk;\r
+package jp.nyatla.nyartoolkit.rpf.tracker.nyartk;\r
 \r
 import jp.nyatla.nyartoolkit.core.types.NyARDoublePoint2d;\r
 import jp.nyatla.nyartoolkit.core.types.NyARIntRect;\r
 import jp.nyatla.nyartoolkit.core.utils.NyARManagedObject;\r
-import jp.nyatla.nyartoolkit.dev.rpf.sampler.lrlabel.LowResolutionLabelingSamplerOut;\r
-import jp.nyatla.nyartoolkit.dev.rpf.tracker.nyartk.status.NyARTargetStatus;\r
+import jp.nyatla.nyartoolkit.rpf.sampler.lrlabel.LowResolutionLabelingSamplerOut;\r
+import jp.nyatla.nyartoolkit.rpf.tracker.nyartk.status.NyARTargetStatus;\r
 \r
 /**\r
  * トラッキングターゲットのクラスです。\r

diff --git a/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/tracker/nyartk/NyARTargetList.java b/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/tracker/nyartk/NyARTargetList.java
index 8244f99..69db98f 100644 (file)
--- a/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/tracker/nyartk/NyARTargetList.java
+++ b/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/tracker/nyartk/NyARTargetList.java
@@ -1,10 +1,8 @@
-package jp.nyatla.nyartoolkit.dev.rpf.tracker.nyartk;\r
+package jp.nyatla.nyartoolkit.rpf.tracker.nyartk;\r
 \r
 import jp.nyatla.nyartoolkit.NyARException;\r
 import jp.nyatla.nyartoolkit.core.types.stack.*;\r
-import jp.nyatla.nyartoolkit.dev.rpf.sampler.lrlabel.*;\r
-import jp.nyatla.nyartoolkit.dev.rpf.tracker.nyartk.status.NyARContourTargetStatus;\r
-import jp.nyatla.nyartoolkit.dev.rpf.tracker.nyartk.status.NyARRectTargetStatus;\r
+import jp.nyatla.nyartoolkit.rpf.sampler.lrlabel.*;\r
 \r
 public class NyARTargetList extends NyARPointerStack<NyARTarget>\r
 {\r

diff --git a/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/tracker/nyartk/NyARTargetPool.java b/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/tracker/nyartk/NyARTargetPool.java
index 38f8874..7d040c0 100644 (file)
--- a/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/tracker/nyartk/NyARTargetPool.java
+++ b/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/tracker/nyartk/NyARTargetPool.java
@@ -1,11 +1,11 @@
-package jp.nyatla.nyartoolkit.dev.rpf.tracker.nyartk;\r
+package jp.nyatla.nyartoolkit.rpf.tracker.nyartk;\r
 \r
 import jp.nyatla.nyartoolkit.NyARException;\r
 import jp.nyatla.nyartoolkit.core.utils.NyARManagedObjectPool;\r
-import jp.nyatla.nyartoolkit.dev.rpf.sampler.lrlabel.LowResolutionLabelingSamplerOut;\r
-import jp.nyatla.nyartoolkit.dev.rpf.tracker.nyartk.status.NyARNewTargetStatus;\r
-import jp.nyatla.nyartoolkit.dev.rpf.tracker.nyartk.status.NyARNewTargetStatusPool;\r
-import jp.nyatla.nyartoolkit.dev.rpf.tracker.nyartk.status.NyARTargetStatus;\r
+import jp.nyatla.nyartoolkit.rpf.sampler.lrlabel.LowResolutionLabelingSamplerOut;\r
+import jp.nyatla.nyartoolkit.rpf.tracker.nyartk.status.NyARNewTargetStatus;\r
+import jp.nyatla.nyartoolkit.rpf.tracker.nyartk.status.NyARNewTargetStatusPool;\r
+import jp.nyatla.nyartoolkit.rpf.tracker.nyartk.status.NyARTargetStatus;\r
 \r
 final public class NyARTargetPool extends NyARManagedObjectPool<NyARTarget>\r
 {\r

diff --git a/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/tracker/nyartk/NyARTracker.java b/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/tracker/nyartk/NyARTracker.java
index 6120acc..4d6c6f3 100644 (file)
--- a/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/tracker/nyartk/NyARTracker.java
+++ b/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/tracker/nyartk/NyARTracker.java
@@ -1,10 +1,10 @@
-package jp.nyatla.nyartoolkit.dev.rpf.tracker.nyartk;\r
+package jp.nyatla.nyartoolkit.rpf.tracker.nyartk;\r
 \r
 import jp.nyatla.nyartoolkit.NyARException;\r
 import jp.nyatla.nyartoolkit.core.types.stack.NyARPointerStack;\r
 import jp.nyatla.nyartoolkit.core.utils.NyARDistMap;\r
-import jp.nyatla.nyartoolkit.dev.rpf.sampler.lrlabel.*;\r
-import jp.nyatla.nyartoolkit.dev.rpf.tracker.nyartk.status.*;\r
+import jp.nyatla.nyartoolkit.rpf.sampler.lrlabel.*;\r
+import jp.nyatla.nyartoolkit.rpf.tracker.nyartk.status.*;\r
 \r
 \r
 \r

diff --git a/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/tracker/nyartk/NyARTrackerSource.java b/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/tracker/nyartk/NyARTrackerSource.java
index a166eab..ec0b3a1 100644 (file)
--- a/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/tracker/nyartk/NyARTrackerSource.java
+++ b/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/tracker/nyartk/NyARTrackerSource.java
@@ -1,9 +1,8 @@
-package jp.nyatla.nyartoolkit.dev.rpf.tracker.nyartk;\r
+package jp.nyatla.nyartoolkit.rpf.tracker.nyartk;\r
 \r
 import jp.nyatla.nyartoolkit.NyARException;\r
 import jp.nyatla.nyartoolkit.core.raster.NyARGrayscaleRaster;\r
-import jp.nyatla.nyartoolkit.dev.rpf.reality.nyartk.NyARReality;\r
-import jp.nyatla.nyartoolkit.dev.rpf.sampler.lrlabel.LowResolutionLabelingSamplerOut;\r
+import jp.nyatla.nyartoolkit.rpf.sampler.lrlabel.LowResolutionLabelingSamplerOut;\r
 \r
 /**\r
  * LowResolutionLabelingSamplerへの入力コンテナの抽象クラスです。\r

diff --git a/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/tracker/nyartk/NyARTrackerSource_Reference.java b/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/tracker/nyartk/NyARTrackerSource_Reference.java
index db1be2c..235740d 100644 (file)
--- a/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/tracker/nyartk/NyARTrackerSource_Reference.java
+++ b/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/tracker/nyartk/NyARTrackerSource_Reference.java
@@ -1,13 +1,11 @@
-package jp.nyatla.nyartoolkit.dev.rpf.tracker.nyartk;\r
+package jp.nyatla.nyartoolkit.rpf.tracker.nyartk;\r
 \r
 import jp.nyatla.nyartoolkit.NyARException;\r
 import jp.nyatla.nyartoolkit.core.param.NyARCameraDistortionFactor;\r
 import jp.nyatla.nyartoolkit.core.raster.NyARGrayscaleRaster;\r
-import jp.nyatla.nyartoolkit.core.rasterfilter.NyARRasterFilter_Reverse;\r
-import jp.nyatla.nyartoolkit.core.rasterfilter.NyARRasterFilter_Roberts;\r
 import jp.nyatla.nyartoolkit.core.types.NyARBufferType;\r
-import jp.nyatla.nyartoolkit.dev.rpf.sampler.lrlabel.LowResolutionLabelingSampler;\r
-import jp.nyatla.nyartoolkit.dev.rpf.sampler.lrlabel.LowResolutionLabelingSamplerOut;\r
+import jp.nyatla.nyartoolkit.rpf.sampler.lrlabel.LowResolutionLabelingSampler;\r
+import jp.nyatla.nyartoolkit.rpf.sampler.lrlabel.LowResolutionLabelingSamplerOut;\r
 \r
 /**\r
  * NyARTrackerSourceのリファレンス実装です。\r

diff --git a/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/tracker/nyartk/NyARVectorReader_INT1D_GRAY_8.java b/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/tracker/nyartk/NyARVectorReader_INT1D_GRAY_8.java
index 8224c9e..39c78fd 100644 (file)
--- a/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/tracker/nyartk/NyARVectorReader_INT1D_GRAY_8.java
+++ b/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/tracker/nyartk/NyARVectorReader_INT1D_GRAY_8.java
@@ -22,7 +22,7 @@
  *     <airmail(at)ebony.plala.or.jp> or <nyatla(at)nyatla.jp>\r
  * \r
  */\r
-package jp.nyatla.nyartoolkit.dev.rpf.tracker.nyartk;\r
+package jp.nyatla.nyartoolkit.rpf.tracker.nyartk;\r
 \r
 import jp.nyatla.nyartoolkit.NyARException;\r
 import jp.nyatla.nyartoolkit.core.param.NyARCameraDistortionFactor;\r
@@ -30,8 +30,8 @@ import jp.nyatla.nyartoolkit.core.raster.NyARGrayscaleRaster;
 import jp.nyatla.nyartoolkit.core.squaredetect.NyARContourPickup;\r
 import jp.nyatla.nyartoolkit.core.types.*;\r
 import jp.nyatla.nyartoolkit.core.utils.NyARMath;\r
-import jp.nyatla.nyartoolkit.dev.rpf.utils.VecLinearCoordinates;\r
-import jp.nyatla.nyartoolkit.dev.rpf.utils.VecLinearCoordinates.NyARVecLinearPoint;\r
+import jp.nyatla.nyartoolkit.rpf.utils.VecLinearCoordinates;\r
+import jp.nyatla.nyartoolkit.rpf.utils.VecLinearCoordinates.NyARVecLinearPoint;\r
 \r
 /**\r
  * グレイスケールラスタに対する、特殊な画素アクセス手段を提供します。\r

diff --git a/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/tracker/nyartk/status/NyARContourTargetStatus.java b/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/tracker/nyartk/status/NyARContourTargetStatus.java
index 118bf22..05da4f3 100644 (file)
--- a/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/tracker/nyartk/status/NyARContourTargetStatus.java
+++ b/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/tracker/nyartk/status/NyARContourTargetStatus.java
@@ -1,10 +1,10 @@
-package jp.nyatla.nyartoolkit.dev.rpf.tracker.nyartk.status;\r
+package jp.nyatla.nyartoolkit.rpf.tracker.nyartk.status;\r
 \r
 import jp.nyatla.nyartoolkit.NyARException;\r
-import jp.nyatla.nyartoolkit.dev.rpf.sampler.lrlabel.LowResolutionLabelingSamplerOut;\r
-import jp.nyatla.nyartoolkit.dev.rpf.tracker.nyartk.NyARTrackerSource;\r
-import jp.nyatla.nyartoolkit.dev.rpf.tracker.nyartk.NyARVectorReader_INT1D_GRAY_8;\r
-import jp.nyatla.nyartoolkit.dev.rpf.utils.VecLinearCoordinates;\r
+import jp.nyatla.nyartoolkit.rpf.sampler.lrlabel.LowResolutionLabelingSamplerOut;\r
+import jp.nyatla.nyartoolkit.rpf.tracker.nyartk.NyARTrackerSource;\r
+import jp.nyatla.nyartoolkit.rpf.tracker.nyartk.NyARVectorReader_INT1D_GRAY_8;\r
+import jp.nyatla.nyartoolkit.rpf.utils.VecLinearCoordinates;\r
 \r
 /**\r
  * 輪郭ソース1個を格納するクラスです。\r

diff --git a/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/tracker/nyartk/status/NyARContourTargetStatusPool.java b/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/tracker/nyartk/status/NyARContourTargetStatusPool.java
index 604978d..6875e70 100644 (file)
--- a/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/tracker/nyartk/status/NyARContourTargetStatusPool.java
+++ b/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/tracker/nyartk/status/NyARContourTargetStatusPool.java
@@ -1,7 +1,6 @@
-package jp.nyatla.nyartoolkit.dev.rpf.tracker.nyartk.status;\r
+package jp.nyatla.nyartoolkit.rpf.tracker.nyartk.status;\r
 \r
 import jp.nyatla.nyartoolkit.NyARException;\r
-\r
 import jp.nyatla.nyartoolkit.core.utils.NyARManagedObjectPool;\r
 \r
 \r

diff --git a/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/tracker/nyartk/status/NyARNewTargetStatus.java b/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/tracker/nyartk/status/NyARNewTargetStatus.java
index 6878e2c..e036d2f 100644 (file)
--- a/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/tracker/nyartk/status/NyARNewTargetStatus.java
+++ b/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/tracker/nyartk/status/NyARNewTargetStatus.java
@@ -1,7 +1,7 @@
-package jp.nyatla.nyartoolkit.dev.rpf.tracker.nyartk.status;\r
+package jp.nyatla.nyartoolkit.rpf.tracker.nyartk.status;\r
 \r
 import jp.nyatla.nyartoolkit.NyARException;\r
-import jp.nyatla.nyartoolkit.dev.rpf.sampler.lrlabel.LowResolutionLabelingSamplerOut;\r
+import jp.nyatla.nyartoolkit.rpf.sampler.lrlabel.LowResolutionLabelingSamplerOut;\r
 \r
 public final class NyARNewTargetStatus extends NyARTargetStatus\r
 {\r

diff --git a/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/tracker/nyartk/status/NyARNewTargetStatusPool.java b/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/tracker/nyartk/status/NyARNewTargetStatusPool.java
index 5b8710f..9f6f266 100644 (file)
--- a/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/tracker/nyartk/status/NyARNewTargetStatusPool.java
+++ b/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/tracker/nyartk/status/NyARNewTargetStatusPool.java
@@ -1,4 +1,4 @@
-package jp.nyatla.nyartoolkit.dev.rpf.tracker.nyartk.status;\r
+package jp.nyatla.nyartoolkit.rpf.tracker.nyartk.status;\r
 \r
 import jp.nyatla.nyartoolkit.NyARException;\r
 import jp.nyatla.nyartoolkit.core.utils.NyARManagedObjectPool;\r

diff --git a/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/tracker/nyartk/status/NyARRectTargetStatus.java b/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/tracker/nyartk/status/NyARRectTargetStatus.java
index 9095658..ebdda78 100644 (file)
--- a/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/tracker/nyartk/status/NyARRectTargetStatus.java
+++ b/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/tracker/nyartk/status/NyARRectTargetStatus.java
@@ -1,12 +1,12 @@
-package jp.nyatla.nyartoolkit.dev.rpf.tracker.nyartk.status;\r
+package jp.nyatla.nyartoolkit.rpf.tracker.nyartk.status;\r
 \r
 \r
 import jp.nyatla.nyartoolkit.NyARException;\r
 import jp.nyatla.nyartoolkit.core.types.*;\r
 import jp.nyatla.nyartoolkit.core.utils.NyARMath;\r
-import jp.nyatla.nyartoolkit.dev.rpf.sampler.lrlabel.LowResolutionLabelingSamplerOut;\r
-import jp.nyatla.nyartoolkit.dev.rpf.tracker.nyartk.NyARVectorReader_INT1D_GRAY_8;\r
-import jp.nyatla.nyartoolkit.dev.rpf.utils.VecLinearCoordinates;\r
+import jp.nyatla.nyartoolkit.rpf.sampler.lrlabel.LowResolutionLabelingSamplerOut;\r
+import jp.nyatla.nyartoolkit.rpf.tracker.nyartk.NyARVectorReader_INT1D_GRAY_8;\r
+import jp.nyatla.nyartoolkit.rpf.utils.VecLinearCoordinates;\r
 \r
 \r
 \r

diff --git a/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/tracker/nyartk/status/NyARRectTargetStatusPool.java b/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/tracker/nyartk/status/NyARRectTargetStatusPool.java
index 7c1a746..bb0819b 100644 (file)
--- a/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/tracker/nyartk/status/NyARRectTargetStatusPool.java
+++ b/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/tracker/nyartk/status/NyARRectTargetStatusPool.java
@@ -1,12 +1,12 @@
-package jp.nyatla.nyartoolkit.dev.rpf.tracker.nyartk.status;\r
+package jp.nyatla.nyartoolkit.rpf.tracker.nyartk.status;\r
 \r
 import jp.nyatla.nyartoolkit.NyARException;\r
 import jp.nyatla.nyartoolkit.core.types.NyARDoublePoint2d;\r
 import jp.nyatla.nyartoolkit.core.types.NyARLinear;\r
 import jp.nyatla.nyartoolkit.core.utils.NyARManagedObjectPool;\r
-import jp.nyatla.nyartoolkit.dev.rpf.utils.LineBaseVertexDetector;\r
-import jp.nyatla.nyartoolkit.dev.rpf.utils.VecLinearCoordinates;\r
-import jp.nyatla.nyartoolkit.dev.rpf.utils.VecLinearCoordinatesOperator;\r
+import jp.nyatla.nyartoolkit.rpf.utils.LineBaseVertexDetector;\r
+import jp.nyatla.nyartoolkit.rpf.utils.VecLinearCoordinates;\r
+import jp.nyatla.nyartoolkit.rpf.utils.VecLinearCoordinatesOperator;\r
 \r
 \r
 public class NyARRectTargetStatusPool extends NyARManagedObjectPool<NyARRectTargetStatus>\r

diff --git a/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/tracker/nyartk/status/NyARTargetStatus.java b/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/tracker/nyartk/status/NyARTargetStatus.java
index ac9f8e3..16883f5 100644 (file)
--- a/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/tracker/nyartk/status/NyARTargetStatus.java
+++ b/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/tracker/nyartk/status/NyARTargetStatus.java
@@ -1,4 +1,4 @@
-package jp.nyatla.nyartoolkit.dev.rpf.tracker.nyartk.status;\r
+package jp.nyatla.nyartoolkit.rpf.tracker.nyartk.status;\r
 \r
 import jp.nyatla.nyartoolkit.core.utils.NyARManagedObject;\r
 \r

diff --git a/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/utils/LineBaseVertexDetector.java b/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/utils/LineBaseVertexDetector.java
index 603e709..f1a3e25 100644 (file)
--- a/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/utils/LineBaseVertexDetector.java
+++ b/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/utils/LineBaseVertexDetector.java
@@ -1,4 +1,4 @@
-package jp.nyatla.nyartoolkit.dev.rpf.utils;\r
+package jp.nyatla.nyartoolkit.rpf.utils;\r
 \r
 import jp.nyatla.nyartoolkit.NyARException;\r
 import jp.nyatla.nyartoolkit.core.types.*;\r

diff --git a/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/utils/VecLinearCoordinates.java b/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/utils/VecLinearCoordinates.java
index 0c593a8..fa499d4 100644 (file)
--- a/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/utils/VecLinearCoordinates.java
+++ b/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/utils/VecLinearCoordinates.java
@@ -1,7 +1,5 @@
-package jp.nyatla.nyartoolkit.dev.rpf.utils;\r
+package jp.nyatla.nyartoolkit.rpf.utils;\r
 \r
-import jp.nyatla.nyartoolkit.core.types.NyARDoublePoint2d;\r
-import jp.nyatla.nyartoolkit.core.types.NyARLinear;\r
 import jp.nyatla.nyartoolkit.core.types.NyARVecLinear2d;\r
 \r
 public class VecLinearCoordinates\r

diff --git a/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/utils/VecLinearCoordinatesOperator.java b/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/utils/VecLinearCoordinatesOperator.java
index 141f430..66a1575 100644 (file)
--- a/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/utils/VecLinearCoordinatesOperator.java
+++ b/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/utils/VecLinearCoordinatesOperator.java
@@ -1,10 +1,9 @@
-package jp.nyatla.nyartoolkit.dev.rpf.utils;\r
+package jp.nyatla.nyartoolkit.rpf.utils;\r
 \r
 import jp.nyatla.nyartoolkit.core.types.NyARDoublePoint2d;\r
 import jp.nyatla.nyartoolkit.core.types.NyARLinear;\r
 import jp.nyatla.nyartoolkit.core.types.NyARVecLinear2d;\r
 import jp.nyatla.nyartoolkit.core.utils.NyARMath;\r
-import jp.nyatla.nyartoolkit.dev.rpf.utils.VecLinearCoordinates;\r
 \r
 public class VecLinearCoordinatesOperator\r
 {\r