[backup]NyARToolkit

+NyARBufferTypeを移動。
+2.5.0候補

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

diff --git a/trunk/sample/sandbox/jp/nyatla/nyartoolkit/core/rasterfilter/NyARRasterFilter_Edge.java b/trunk/sample/sandbox/jp/nyatla/nyartoolkit/core/rasterfilter/NyARRasterFilter_Edge.java
index ed04d31..0e16939 100644 (file)
--- a/trunk/sample/sandbox/jp/nyatla/nyartoolkit/core/rasterfilter/NyARRasterFilter_Edge.java
+++ b/trunk/sample/sandbox/jp/nyatla/nyartoolkit/core/rasterfilter/NyARRasterFilter_Edge.java
@@ -33,6 +33,7 @@ package jp.nyatla.nyartoolkit.core.rasterfilter;
 import jp.nyatla.nyartoolkit.NyARException;\r
 import jp.nyatla.nyartoolkit.core.raster.*;\r
 import jp.nyatla.nyartoolkit.core.rasterfilter.INyARRasterFilter;\r
+import jp.nyatla.nyartoolkit.core.types.NyARBufferType;\r
 import jp.nyatla.nyartoolkit.core.types.NyARIntSize;\r
 \r
 /**\r

diff --git a/trunk/sample/sandbox/jp/nyatla/nyartoolkit/core/rasterfilter/NyARRasterOperator_Mul.java b/trunk/sample/sandbox/jp/nyatla/nyartoolkit/core/rasterfilter/NyARRasterOperator_Mul.java
index e2b44bb..77c6a31 100644 (file)
--- a/trunk/sample/sandbox/jp/nyatla/nyartoolkit/core/rasterfilter/NyARRasterOperator_Mul.java
+++ b/trunk/sample/sandbox/jp/nyatla/nyartoolkit/core/rasterfilter/NyARRasterOperator_Mul.java
@@ -32,6 +32,7 @@ package jp.nyatla.nyartoolkit.core.rasterfilter;
 \r
 import jp.nyatla.nyartoolkit.NyARException;\r
 import jp.nyatla.nyartoolkit.core.raster.*;\r
+import jp.nyatla.nyartoolkit.core.types.NyARBufferType;\r
 import jp.nyatla.nyartoolkit.core.types.NyARIntSize;\r
 \r
 /**\r

diff --git a/trunk/sample/sandbox/jp/nyatla/nyartoolkit/core/rasterfilter/rgb2gs/NyARRasterFilter_Rgb2Gs_CbCrCut.java b/trunk/sample/sandbox/jp/nyatla/nyartoolkit/core/rasterfilter/rgb2gs/NyARRasterFilter_Rgb2Gs_CbCrCut.java
index e5a47df..772009d 100644 (file)
--- a/trunk/sample/sandbox/jp/nyatla/nyartoolkit/core/rasterfilter/rgb2gs/NyARRasterFilter_Rgb2Gs_CbCrCut.java
+++ b/trunk/sample/sandbox/jp/nyatla/nyartoolkit/core/rasterfilter/rgb2gs/NyARRasterFilter_Rgb2Gs_CbCrCut.java
@@ -3,6 +3,7 @@ package jp.nyatla.nyartoolkit.core.rasterfilter.rgb2gs;
 import jp.nyatla.nyartoolkit.NyARException;\r
 import jp.nyatla.nyartoolkit.core.raster.*;\r
 import jp.nyatla.nyartoolkit.core.raster.rgb.INyARRgbRaster;\r
+import jp.nyatla.nyartoolkit.core.types.NyARBufferType;\r
 import jp.nyatla.nyartoolkit.core.types.NyARIntSize;\r
 \r
 /**\r

diff --git a/trunk/sample/sandbox/jp/nyatla/nyartoolkit/core/rasterfilter/rgb2gs/NyARRasterFilter_Rgb2Gs_RgbOr.java b/trunk/sample/sandbox/jp/nyatla/nyartoolkit/core/rasterfilter/rgb2gs/NyARRasterFilter_Rgb2Gs_RgbOr.java
index 942d849..a649f77 100644 (file)
--- a/trunk/sample/sandbox/jp/nyatla/nyartoolkit/core/rasterfilter/rgb2gs/NyARRasterFilter_Rgb2Gs_RgbOr.java
+++ b/trunk/sample/sandbox/jp/nyatla/nyartoolkit/core/rasterfilter/rgb2gs/NyARRasterFilter_Rgb2Gs_RgbOr.java
@@ -34,6 +34,7 @@ import jp.nyatla.nyartoolkit.NyARException;
 import jp.nyatla.nyartoolkit.core.raster.*;\r
 import jp.nyatla.nyartoolkit.core.raster.rgb.INyARRgbRaster;\r
 import jp.nyatla.nyartoolkit.core.rasterfilter.rgb2gs.INyARRasterFilter_Rgb2Gs;\r
+import jp.nyatla.nyartoolkit.core.types.NyARBufferType;\r
 import jp.nyatla.nyartoolkit.core.types.NyARIntSize;\r
 \r
 public class NyARRasterFilter_Rgb2Gs_RgbOr implements INyARRasterFilter_Rgb2Gs\r

diff --git a/trunk/sample/sandbox/jp/nyatla/nyartoolkit/utils/j2se/NyARRGBRaster_BufferedImage.java b/trunk/sample/sandbox/jp/nyatla/nyartoolkit/utils/j2se/NyARRGBRaster_BufferedImage.java
index 4817bff..b1e4a6b 100644 (file)
--- a/trunk/sample/sandbox/jp/nyatla/nyartoolkit/utils/j2se/NyARRGBRaster_BufferedImage.java
+++ b/trunk/sample/sandbox/jp/nyatla/nyartoolkit/utils/j2se/NyARRGBRaster_BufferedImage.java
@@ -1,6 +1,7 @@
 package jp.nyatla.nyartoolkit.utils.j2se;\r
 \r
 import jp.nyatla.nyartoolkit.NyARException;\r
+import jp.nyatla.nyartoolkit.core.types.NyARBufferType;\r
 import jp.nyatla.nyartoolkit.core.types.NyARIntSize;\r
 import jp.nyatla.nyartoolkit.core.raster.rgb.*;\r
 import jp.nyatla.nyartoolkit.core.raster.*;\r

diff --git a/trunk/src.utils/java3d/jp/nyatla/nyartoolkit/java3d/utils/J3dNyARRaster_RGB.java b/trunk/src.utils/java3d/jp/nyatla/nyartoolkit/java3d/utils/J3dNyARRaster_RGB.java
index ea63b41..3635e17 100644 (file)
--- a/trunk/src.utils/java3d/jp/nyatla/nyartoolkit/java3d/utils/J3dNyARRaster_RGB.java
+++ b/trunk/src.utils/java3d/jp/nyatla/nyartoolkit/java3d/utils/J3dNyARRaster_RGB.java
@@ -36,6 +36,7 @@ import jp.nyatla.nyartoolkit.NyARException;
 import jp.nyatla.nyartoolkit.core.param.NyARParam;\r
 import jp.nyatla.nyartoolkit.jmf.utils.*;\r
 import jp.nyatla.nyartoolkit.core.raster.*;\r
+import jp.nyatla.nyartoolkit.core.types.NyARBufferType;\r
 /**\r
  * \r
  * このクラスは、Java3Dと互換性のあるNyARToolkitのラスタイメージを保持します。\r

diff --git a/trunk/src.utils/jogl/jp/nyatla/nyartoolkit/jogl/utils/GLNyARRaster_RGB.java b/trunk/src.utils/jogl/jp/nyatla/nyartoolkit/jogl/utils/GLNyARRaster_RGB.java
index ea7ac68..c97d454 100644 (file)
--- a/trunk/src.utils/jogl/jp/nyatla/nyartoolkit/jogl/utils/GLNyARRaster_RGB.java
+++ b/trunk/src.utils/jogl/jp/nyatla/nyartoolkit/jogl/utils/GLNyARRaster_RGB.java
@@ -37,6 +37,8 @@ import jp.nyatla.nyartoolkit.NyARException;
 import jp.nyatla.nyartoolkit.jmf.utils.*;\r
 import jp.nyatla.nyartoolkit.core.param.NyARParam;\r
 import jp.nyatla.nyartoolkit.core.raster.*;\r
+import jp.nyatla.nyartoolkit.core.types.NyARBufferType;\r
+\r
 import javax.media.format.*;\r
 \r
 /**\r

diff --git a/trunk/src/jp/nyatla/nyartoolkit/core/NyARCode.java b/trunk/src/jp/nyatla/nyartoolkit/core/NyARCode.java
index 3bddad4..7cd7028 100644 (file)
--- a/trunk/src/jp/nyatla/nyartoolkit/core/NyARCode.java
+++ b/trunk/src/jp/nyatla/nyartoolkit/core/NyARCode.java
@@ -38,6 +38,7 @@ import java.io.StreamTokenizer;
 import jp.nyatla.nyartoolkit.*;\r
 import jp.nyatla.nyartoolkit.core.match.*;\r
 import jp.nyatla.nyartoolkit.core.raster.*;\r
+import jp.nyatla.nyartoolkit.core.types.NyARBufferType;\r
 \r
 class NyARCodeFileReader\r
 {\r

diff --git a/trunk/src/jp/nyatla/nyartoolkit/core/analyzer/raster/NyARRasterAnalyzer_Histogram.java b/trunk/src/jp/nyatla/nyartoolkit/core/analyzer/raster/NyARRasterAnalyzer_Histogram.java
index 40a82bd..69d02d3 100644 (file)
--- a/trunk/src/jp/nyatla/nyartoolkit/core/analyzer/raster/NyARRasterAnalyzer_Histogram.java
+++ b/trunk/src/jp/nyatla/nyartoolkit/core/analyzer/raster/NyARRasterAnalyzer_Histogram.java
@@ -2,6 +2,7 @@ package jp.nyatla.nyartoolkit.core.analyzer.raster;
 \r
 import jp.nyatla.nyartoolkit.NyARException;\r
 import jp.nyatla.nyartoolkit.core.raster.*;\r
+import jp.nyatla.nyartoolkit.core.types.NyARBufferType;\r
 import jp.nyatla.nyartoolkit.core.types.NyARHistogram;\r
 import jp.nyatla.nyartoolkit.core.types.NyARIntSize;\r
 /**\r

diff --git a/trunk/src/jp/nyatla/nyartoolkit/core/labeling/rlelabeling/NyARLabeling_Rle.java b/trunk/src/jp/nyatla/nyartoolkit/core/labeling/rlelabeling/NyARLabeling_Rle.java
index 00f00cf..f3f4eab 100644 (file)
--- a/trunk/src/jp/nyatla/nyartoolkit/core/labeling/rlelabeling/NyARLabeling_Rle.java
+++ b/trunk/src/jp/nyatla/nyartoolkit/core/labeling/rlelabeling/NyARLabeling_Rle.java
@@ -26,6 +26,7 @@ package jp.nyatla.nyartoolkit.core.labeling.rlelabeling;
 \r
 import jp.nyatla.nyartoolkit.NyARException;\r
 import jp.nyatla.nyartoolkit.core.raster.*;\r
+import jp.nyatla.nyartoolkit.core.types.NyARBufferType;\r
 import jp.nyatla.nyartoolkit.core.types.stack.NyARObjectStack;\r
 \r
 class RleInfoStack extends NyARObjectStack<RleInfoStack.RleInfo>\r

diff --git a/trunk/src/jp/nyatla/nyartoolkit/core/match/NyARMatchPattDeviationColorData.java b/trunk/src/jp/nyatla/nyartoolkit/core/match/NyARMatchPattDeviationColorData.java
index 1d3555f..e06f7d6 100644 (file)
--- a/trunk/src/jp/nyatla/nyartoolkit/core/match/NyARMatchPattDeviationColorData.java
+++ b/trunk/src/jp/nyatla/nyartoolkit/core/match/NyARMatchPattDeviationColorData.java
@@ -33,6 +33,7 @@ package jp.nyatla.nyartoolkit.core.match;
 \r
 import jp.nyatla.nyartoolkit.core.raster.*;\r
 import jp.nyatla.nyartoolkit.core.rasterreader.*;\r
+import jp.nyatla.nyartoolkit.core.types.NyARBufferType;\r
 \r
 /**\r
  * INyARMatchPattのRGBColor差分データを格納するクラスです。\r

diff --git a/trunk/src/jp/nyatla/nyartoolkit/core/raster/rgb/NyARRgbRaster_BGRA.java b/trunk/src/jp/nyatla/nyartoolkit/core/raster/rgb/NyARRgbRaster_BGRA.java
index a1c1205..d29e2dd 100644 (file)
--- a/trunk/src/jp/nyatla/nyartoolkit/core/raster/rgb/NyARRgbRaster_BGRA.java
+++ b/trunk/src/jp/nyatla/nyartoolkit/core/raster/rgb/NyARRgbRaster_BGRA.java
@@ -32,6 +32,7 @@ package jp.nyatla.nyartoolkit.core.raster.rgb;
 \r
 import jp.nyatla.nyartoolkit.NyARException;\r
 import jp.nyatla.nyartoolkit.core.raster.*;\r
+import jp.nyatla.nyartoolkit.core.types.NyARBufferType;\r
 \r
 public class NyARRgbRaster_BGRA extends NyARRgbRaster\r
 {\r

diff --git a/trunk/src/jp/nyatla/nyartoolkit/core/raster/rgb/NyARRgbRaster_RGB.java b/trunk/src/jp/nyatla/nyartoolkit/core/raster/rgb/NyARRgbRaster_RGB.java
index 2207c7a..3815ad6 100644 (file)
--- a/trunk/src/jp/nyatla/nyartoolkit/core/raster/rgb/NyARRgbRaster_RGB.java
+++ b/trunk/src/jp/nyatla/nyartoolkit/core/raster/rgb/NyARRgbRaster_RGB.java
@@ -32,6 +32,7 @@ package jp.nyatla.nyartoolkit.core.raster.rgb;
 \r
 import jp.nyatla.nyartoolkit.NyARException;\r
 import jp.nyatla.nyartoolkit.core.raster.*;\r
+import jp.nyatla.nyartoolkit.core.types.NyARBufferType;\r
 \r
 public class NyARRgbRaster_RGB extends NyARRgbRaster\r
 {\r

diff --git a/trunk/src/jp/nyatla/nyartoolkit/core/rasterfilter/NyARRasterFilter_CustomToneTable.java b/trunk/src/jp/nyatla/nyartoolkit/core/rasterfilter/NyARRasterFilter_CustomToneTable.java
index ec005f8..b17ea32 100644 (file)
--- a/trunk/src/jp/nyatla/nyartoolkit/core/rasterfilter/NyARRasterFilter_CustomToneTable.java
+++ b/trunk/src/jp/nyatla/nyartoolkit/core/rasterfilter/NyARRasterFilter_CustomToneTable.java
@@ -26,6 +26,7 @@ package jp.nyatla.nyartoolkit.core.rasterfilter;
 \r
 import jp.nyatla.nyartoolkit.NyARException;\r
 import jp.nyatla.nyartoolkit.core.raster.*;\r
+import jp.nyatla.nyartoolkit.core.types.NyARBufferType;\r
 import jp.nyatla.nyartoolkit.core.types.NyARIntSize;\r
 \r
 /**\r

diff --git a/trunk/src/jp/nyatla/nyartoolkit/core/rasterfilter/NyARRasterFilter_GaussianSmooth.java b/trunk/src/jp/nyatla/nyartoolkit/core/rasterfilter/NyARRasterFilter_GaussianSmooth.java
index 40a0ab8..b152697 100644 (file)
--- a/trunk/src/jp/nyatla/nyartoolkit/core/rasterfilter/NyARRasterFilter_GaussianSmooth.java
+++ b/trunk/src/jp/nyatla/nyartoolkit/core/rasterfilter/NyARRasterFilter_GaussianSmooth.java
@@ -26,6 +26,7 @@ package jp.nyatla.nyartoolkit.core.rasterfilter;
 \r
 import jp.nyatla.nyartoolkit.NyARException;\r
 import jp.nyatla.nyartoolkit.core.raster.*;\r
+import jp.nyatla.nyartoolkit.core.types.NyARBufferType;\r
 import jp.nyatla.nyartoolkit.core.types.NyARIntSize;\r
 \r
 \r

diff --git a/trunk/src/jp/nyatla/nyartoolkit/core/rasterfilter/NyARRasterFilter_Rgb2Hsv.java b/trunk/src/jp/nyatla/nyartoolkit/core/rasterfilter/NyARRasterFilter_Rgb2Hsv.java
index 443eb7b..634a11d 100644 (file)
--- a/trunk/src/jp/nyatla/nyartoolkit/core/rasterfilter/NyARRasterFilter_Rgb2Hsv.java
+++ b/trunk/src/jp/nyatla/nyartoolkit/core/rasterfilter/NyARRasterFilter_Rgb2Hsv.java
@@ -2,6 +2,7 @@ package jp.nyatla.nyartoolkit.core.rasterfilter;
 \r
 import jp.nyatla.nyartoolkit.NyARException;\r
 import jp.nyatla.nyartoolkit.core.raster.*;\r
+import jp.nyatla.nyartoolkit.core.types.NyARBufferType;\r
 import jp.nyatla.nyartoolkit.core.types.NyARIntSize;\r
 \r
 /**\r

diff --git a/trunk/src/jp/nyatla/nyartoolkit/core/rasterfilter/NyARRasterFilter_Roberts.java b/trunk/src/jp/nyatla/nyartoolkit/core/rasterfilter/NyARRasterFilter_Roberts.java
index 9d943fa..d227530 100644 (file)
--- a/trunk/src/jp/nyatla/nyartoolkit/core/rasterfilter/NyARRasterFilter_Roberts.java
+++ b/trunk/src/jp/nyatla/nyartoolkit/core/rasterfilter/NyARRasterFilter_Roberts.java
@@ -26,6 +26,7 @@ package jp.nyatla.nyartoolkit.core.rasterfilter;
 \r
 import jp.nyatla.nyartoolkit.NyARException;\r
 import jp.nyatla.nyartoolkit.core.raster.*;\r
+import jp.nyatla.nyartoolkit.core.types.NyARBufferType;\r
 import jp.nyatla.nyartoolkit.core.types.NyARIntSize;\r
 \r
 /**\r

diff --git a/trunk/src/jp/nyatla/nyartoolkit/core/rasterfilter/NyARRasterFilter_SimpleSmooth.java b/trunk/src/jp/nyatla/nyartoolkit/core/rasterfilter/NyARRasterFilter_SimpleSmooth.java
index 61136b1..796bf84 100644 (file)
--- a/trunk/src/jp/nyatla/nyartoolkit/core/rasterfilter/NyARRasterFilter_SimpleSmooth.java
+++ b/trunk/src/jp/nyatla/nyartoolkit/core/rasterfilter/NyARRasterFilter_SimpleSmooth.java
@@ -26,6 +26,7 @@ package jp.nyatla.nyartoolkit.core.rasterfilter;
 \r
 import jp.nyatla.nyartoolkit.NyARException;\r
 import jp.nyatla.nyartoolkit.core.raster.*;\r
+import jp.nyatla.nyartoolkit.core.types.NyARBufferType;\r
 import jp.nyatla.nyartoolkit.core.types.NyARIntSize;\r
 \r
 \r

diff --git a/trunk/src/jp/nyatla/nyartoolkit/core/rasterfilter/gs2bin/NyARRasterFilter_ConstantThreshold.java b/trunk/src/jp/nyatla/nyartoolkit/core/rasterfilter/gs2bin/NyARRasterFilter_ConstantThreshold.java
index 5c0aa21..465d7be 100644 (file)
--- a/trunk/src/jp/nyatla/nyartoolkit/core/rasterfilter/gs2bin/NyARRasterFilter_ConstantThreshold.java
+++ b/trunk/src/jp/nyatla/nyartoolkit/core/rasterfilter/gs2bin/NyARRasterFilter_ConstantThreshold.java
@@ -2,7 +2,7 @@ package jp.nyatla.nyartoolkit.core.rasterfilter.gs2bin;
 \r
 import jp.nyatla.nyartoolkit.NyARException;\r
 import jp.nyatla.nyartoolkit.core.raster.*;\r
-import jp.nyatla.nyartoolkit.core.raster.NyARGrayscaleRaster;\r
+import jp.nyatla.nyartoolkit.core.types.NyARBufferType;\r
 import jp.nyatla.nyartoolkit.core.types.NyARIntSize;\r
 \r
 public class NyARRasterFilter_ConstantThreshold implements INyARRasterFilter_Gs2Bin\r

diff --git a/trunk/src/jp/nyatla/nyartoolkit/core/rasterfilter/rgb2bin/NyARRasterFilter_ARToolkitThreshold.java b/trunk/src/jp/nyatla/nyartoolkit/core/rasterfilter/rgb2bin/NyARRasterFilter_ARToolkitThreshold.java
index 9f2641d..6b61f86 100644 (file)
--- a/trunk/src/jp/nyatla/nyartoolkit/core/rasterfilter/rgb2bin/NyARRasterFilter_ARToolkitThreshold.java
+++ b/trunk/src/jp/nyatla/nyartoolkit/core/rasterfilter/rgb2bin/NyARRasterFilter_ARToolkitThreshold.java
@@ -3,6 +3,7 @@ package jp.nyatla.nyartoolkit.core.rasterfilter.rgb2bin;
 import jp.nyatla.nyartoolkit.NyARException;\r
 import jp.nyatla.nyartoolkit.core.raster.*;\r
 import jp.nyatla.nyartoolkit.core.raster.rgb.INyARRgbRaster;\r
+import jp.nyatla.nyartoolkit.core.types.NyARBufferType;\r
 import jp.nyatla.nyartoolkit.core.types.NyARIntSize;\r
 \r
 \r

diff --git a/trunk/src/jp/nyatla/nyartoolkit/core/rasterfilter/rgb2gs/NyARRasterFilter_Rgb2Gs_AveAdd.java b/trunk/src/jp/nyatla/nyartoolkit/core/rasterfilter/rgb2gs/NyARRasterFilter_Rgb2Gs_AveAdd.java
index bf7404f..98b3dec 100644 (file)
--- a/trunk/src/jp/nyatla/nyartoolkit/core/rasterfilter/rgb2gs/NyARRasterFilter_Rgb2Gs_AveAdd.java
+++ b/trunk/src/jp/nyatla/nyartoolkit/core/rasterfilter/rgb2gs/NyARRasterFilter_Rgb2Gs_AveAdd.java
@@ -33,6 +33,7 @@ package jp.nyatla.nyartoolkit.core.rasterfilter.rgb2gs;
 import jp.nyatla.nyartoolkit.NyARException;\r
 import jp.nyatla.nyartoolkit.core.raster.*;\r
 import jp.nyatla.nyartoolkit.core.raster.rgb.INyARRgbRaster;\r
+import jp.nyatla.nyartoolkit.core.types.NyARBufferType;\r
 import jp.nyatla.nyartoolkit.core.types.NyARIntSize;\r
 \r
 /**\r

diff --git a/trunk/src/jp/nyatla/nyartoolkit/core/rasterfilter/rgb2gs/NyARRasterFilter_Rgb2Gs_RgbCube.java b/trunk/src/jp/nyatla/nyartoolkit/core/rasterfilter/rgb2gs/NyARRasterFilter_Rgb2Gs_RgbCube.java
index 112656e..9b023c6 100644 (file)
--- a/trunk/src/jp/nyatla/nyartoolkit/core/rasterfilter/rgb2gs/NyARRasterFilter_Rgb2Gs_RgbCube.java
+++ b/trunk/src/jp/nyatla/nyartoolkit/core/rasterfilter/rgb2gs/NyARRasterFilter_Rgb2Gs_RgbCube.java
@@ -34,6 +34,7 @@ import jp.nyatla.nyartoolkit.NyARException;
 import jp.nyatla.nyartoolkit.core.raster.*;\r
 import jp.nyatla.nyartoolkit.core.raster.rgb.INyARRgbRaster;\r
 import jp.nyatla.nyartoolkit.core.rasterfilter.rgb2gs.INyARRasterFilter_Rgb2Gs;\r
+import jp.nyatla.nyartoolkit.core.types.NyARBufferType;\r
 import jp.nyatla.nyartoolkit.core.types.NyARIntSize;\r
 \r
 \r

diff --git a/trunk/src/jp/nyatla/nyartoolkit/core/rasterfilter/rgb2gs/NyARRasterFilter_Rgb2Gs_YCbCr.java b/trunk/src/jp/nyatla/nyartoolkit/core/rasterfilter/rgb2gs/NyARRasterFilter_Rgb2Gs_YCbCr.java
index 6c270a2..f08e92b 100644 (file)
--- a/trunk/src/jp/nyatla/nyartoolkit/core/rasterfilter/rgb2gs/NyARRasterFilter_Rgb2Gs_YCbCr.java
+++ b/trunk/src/jp/nyatla/nyartoolkit/core/rasterfilter/rgb2gs/NyARRasterFilter_Rgb2Gs_YCbCr.java
@@ -28,6 +28,7 @@ import jp.nyatla.nyartoolkit.NyARException;
 import jp.nyatla.nyartoolkit.core.raster.*;\r
 import jp.nyatla.nyartoolkit.core.raster.rgb.INyARRgbRaster;\r
 import jp.nyatla.nyartoolkit.core.rasterfilter.rgb2gs.INyARRasterFilter_Rgb2Gs;\r
+import jp.nyatla.nyartoolkit.core.types.NyARBufferType;\r
 import jp.nyatla.nyartoolkit.core.types.NyARIntSize;\r
 \r
 /**\r

diff --git a/trunk/src/jp/nyatla/nyartoolkit/core/rasterreader/NyARVectorReader_INT1D_GRAY_8.java b/trunk/src/jp/nyatla/nyartoolkit/core/rasterreader/NyARVectorReader_INT1D_GRAY_8.java
index 607709c..1c1c7e2 100644 (file)
--- a/trunk/src/jp/nyatla/nyartoolkit/core/rasterreader/NyARVectorReader_INT1D_GRAY_8.java
+++ b/trunk/src/jp/nyatla/nyartoolkit/core/rasterreader/NyARVectorReader_INT1D_GRAY_8.java
@@ -25,6 +25,7 @@
 package jp.nyatla.nyartoolkit.core.rasterreader;\r
 \r
 import jp.nyatla.nyartoolkit.core.raster.*;\r
+import jp.nyatla.nyartoolkit.core.types.NyARBufferType;\r
 import jp.nyatla.nyartoolkit.core.types.NyARIntPoint2d;\r
 import jp.nyatla.nyartoolkit.core.types.NyARIntSize;\r
 \r

diff --git a/trunk/src/jp/nyatla/nyartoolkit/core/squaredetect/NyARContourPickup.java b/trunk/src/jp/nyatla/nyartoolkit/core/squaredetect/NyARContourPickup.java
index a360fa0..f8ff91f 100644 (file)
--- a/trunk/src/jp/nyatla/nyartoolkit/core/squaredetect/NyARContourPickup.java
+++ b/trunk/src/jp/nyatla/nyartoolkit/core/squaredetect/NyARContourPickup.java
@@ -32,6 +32,7 @@ package jp.nyatla.nyartoolkit.core.squaredetect;
 \r
 import jp.nyatla.nyartoolkit.NyARException;\r
 import jp.nyatla.nyartoolkit.core.raster.*;\r
+import jp.nyatla.nyartoolkit.core.types.NyARBufferType;\r
 import jp.nyatla.nyartoolkit.core.labeling.artoolkit.*;\r
 \r
 /**\r

diff --git a/trunk/src/jp/nyatla/nyartoolkit/core/raster/NyARBufferType.java b/trunk/src/jp/nyatla/nyartoolkit/core/types/NyARBufferType.java
similarity index 95%
rename from trunk/src/jp/nyatla/nyartoolkit/core/raster/NyARBufferType.java
rename to trunk/src/jp/nyatla/nyartoolkit/core/types/NyARBufferType.java
index 9c581c0..4a6bc0c 100644 (file)
--- a/trunk/src/jp/nyatla/nyartoolkit/core/raster/NyARBufferType.java
+++ b/trunk/src/jp/nyatla/nyartoolkit/core/types/NyARBufferType.java
@@ -1,4 +1,4 @@
-package jp.nyatla.nyartoolkit.core.raster;\r
+package jp.nyatla.nyartoolkit.core.types;\r
 \r
 public class NyARBufferType\r
 {\r