From fe859a2f8942177db28d1d3b8155778c55a470e3 Mon Sep 17 00:00:00 2001
From: nyatla <nyatla@7cac0a50-4618-4814-88d0-24b83990f816>
Date: Fri, 19 Sep 2008 12:54:48 +0000
Subject: [PATCH] =?utf8?q?[=E3=83=90=E3=83=83=E3=82=AF=E3=82=A2=E3=83=83?=
 =?utf8?q?=E3=83=97]NyARToolkit=20core2=E3=81=AE=E3=83=95=E3=82=A1?=
 =?utf8?q?=E3=82=A4=E3=83=AB=E7=A7=BB=E5=8B=95/=E3=81=9D=E3=81=AE=E4=BB=96?=
 =?utf8?q?=E4=B8=80=E6=99=82=E3=83=97=E3=83=AD=E3=82=B0=E3=83=A9=E3=83=A0?=
 =?utf8?q?=E3=81=AE=E9=85=8D=E7=BD=AE/=E9=96=A2=E6=95=B0=E5=9E=8B=E3=81=AE?=
 =?utf8?q?=E5=A4=89=E6=9B=B4=E3=81=AA=E3=81=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

git-svn-id: http://svn.sourceforge.jp/svnroot/nyartoolkit/NyARToolkit@178 7cac0a50-4618-4814-88d0-24b83990f816
---
 trunk/src/jp/nyatla/nyartoolkit/core/NyARSquareStack.java            | 1 -
 .../jp/nyatla/nyartoolkit/core/labeling/NyARLabelingLabelStack.java  | 1 -
 .../jp/nyatla/nyartoolkit/core/param/NyARCameraDistortionFactor.java | 1 -
 .../rasterfilter/rgb2bin/NyARRasterFilter_ARToolkitThreshold.java    | 1 +
 .../jp/nyatla/nyartoolkit/core/rasterreader/INyARBufferReader.java   | 5 +++++
 .../nyartoolkit/{core2 => nymodel}/x2/NyARLabeling_ARToolKit_X2.java | 2 +-
 .../nyartoolkit/{core2 => nymodel}/x2/NyARRasterFilter_Edge.java     | 2 +-
 .../nyartoolkit/{core2 => nymodel}/x2/NyARRotTransOptimize_X2.java   | 2 +-
 .../nyartoolkit/{core2 => nymodel}/x2/NyARSingleDetectMarker_X2.java | 2 +-
 .../nyartoolkit/{core2 => nymodel}/x2/NyARSquareDetector_X2.java     | 2 +-
 .../jp/nyatla/nyartoolkit/{core2 => nymodel}/x2/NyARTransMat_X2.java | 2 +-
 trunk/src/jp/nyatla/nyartoolkit/sample/{ => x2}/RawFileTest_X2.java  | 4 ++--
 12 files changed, 14 insertions(+), 11 deletions(-)
 rename trunk/src/jp/nyatla/nyartoolkit/{core2 => nymodel}/x2/NyARLabeling_ARToolKit_X2.java (96%)
 rename trunk/src/jp/nyatla/nyartoolkit/{core2 => nymodel}/x2/NyARRasterFilter_Edge.java (95%)
 rename trunk/src/jp/nyatla/nyartoolkit/{core2 => nymodel}/x2/NyARRotTransOptimize_X2.java (96%)
 rename trunk/src/jp/nyatla/nyartoolkit/{core2 => nymodel}/x2/NyARSingleDetectMarker_X2.java (96%)
 rename trunk/src/jp/nyatla/nyartoolkit/{core2 => nymodel}/x2/NyARSquareDetector_X2.java (96%)
 rename trunk/src/jp/nyatla/nyartoolkit/{core2 => nymodel}/x2/NyARTransMat_X2.java (95%)
 rename trunk/src/jp/nyatla/nyartoolkit/sample/{ => x2}/RawFileTest_X2.java (94%)

diff --git a/trunk/src/jp/nyatla/nyartoolkit/core/NyARSquareStack.java b/trunk/src/jp/nyatla/nyartoolkit/core/NyARSquareStack.java
index a88109a..889add1 100644
--- a/trunk/src/jp/nyatla/nyartoolkit/core/NyARSquareStack.java
+++ b/trunk/src/jp/nyatla/nyartoolkit/core/NyARSquareStack.java
@@ -31,7 +31,6 @@
  */
 package jp.nyatla.nyartoolkit.core;
 
-import jp.nyatla.nyartoolkit.NyARException;
 import jp.nyatla.utils.*;
 
 public class NyARSquareStack extends NyObjectStack
diff --git a/trunk/src/jp/nyatla/nyartoolkit/core/labeling/NyARLabelingLabelStack.java b/trunk/src/jp/nyatla/nyartoolkit/core/labeling/NyARLabelingLabelStack.java
index 0ed1c0b..0783f3c 100644
--- a/trunk/src/jp/nyatla/nyartoolkit/core/labeling/NyARLabelingLabelStack.java
+++ b/trunk/src/jp/nyatla/nyartoolkit/core/labeling/NyARLabelingLabelStack.java
@@ -31,7 +31,6 @@
  */
 package jp.nyatla.nyartoolkit.core.labeling;
 
-import jp.nyatla.nyartoolkit.NyARException;
 import jp.nyatla.utils.*;
 
 /**
diff --git a/trunk/src/jp/nyatla/nyartoolkit/core/param/NyARCameraDistortionFactor.java b/trunk/src/jp/nyatla/nyartoolkit/core/param/NyARCameraDistortionFactor.java
index a1ea920..92c3975 100644
--- a/trunk/src/jp/nyatla/nyartoolkit/core/param/NyARCameraDistortionFactor.java
+++ b/trunk/src/jp/nyatla/nyartoolkit/core/param/NyARCameraDistortionFactor.java
@@ -32,7 +32,6 @@
 package jp.nyatla.nyartoolkit.core.param;
 
 import jp.nyatla.nyartoolkit.core.types.NyARDoublePoint2d;
-import jp.nyatla.utils.DoubleValue;
 
 /**
  * カメラの歪み成分を格納するクラスと、補正関数群
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 fdfdc59..ca4e973 100644
--- a/trunk/src/jp/nyatla/nyartoolkit/core/rasterfilter/rgb2bin/NyARRasterFilter_ARToolkitThreshold.java
+++ b/trunk/src/jp/nyatla/nyartoolkit/core/rasterfilter/rgb2bin/NyARRasterFilter_ARToolkitThreshold.java
@@ -182,6 +182,7 @@ public class NyARRasterFilter_ARToolkitThreshold implements INyARRasterFilter_Rg
 		case INyARBufferReader.BUFFERFORMAT_BYTE1D_B8G8R8_24:
 		case INyARBufferReader.BUFFERFORMAT_BYTE1D_R8G8B8_24:
 		case INyARBufferReader.BUFFERFORMAT_BYTE1D_B8G8R8X8_32:
+		case INyARBufferReader.BUFFERFORMAT_BYTE1D_R5G6B5_16LE:
 			return true;
 		default:
 			return false;
diff --git a/trunk/src/jp/nyatla/nyartoolkit/core/rasterreader/INyARBufferReader.java b/trunk/src/jp/nyatla/nyartoolkit/core/rasterreader/INyARBufferReader.java
index 24f1815..46d6cae 100644
--- a/trunk/src/jp/nyatla/nyartoolkit/core/rasterreader/INyARBufferReader.java
+++ b/trunk/src/jp/nyatla/nyartoolkit/core/rasterreader/INyARBufferReader.java
@@ -54,6 +54,11 @@ public interface INyARBufferReader
 	public static final int BUFFERFORMAT_BYTE1D_B8G8R8X8_32 = 0x00010101;
 
 	/**
+	 * byte[]で、RGB565の16ビット(little endian)で画素が格納されている。
+	 */
+	public static final int BUFFERFORMAT_BYTE1D_R5G6B5_16LE = 0x00010201;
+	
+	/**
 	 * int[][]で特に値範囲を定めない
 	 */
 	public static final int BUFFERFORMAT_INT2D = 0x00020000;
diff --git a/trunk/src/jp/nyatla/nyartoolkit/core2/x2/NyARLabeling_ARToolKit_X2.java b/trunk/src/jp/nyatla/nyartoolkit/nymodel/x2/NyARLabeling_ARToolKit_X2.java
similarity index 96%
rename from trunk/src/jp/nyatla/nyartoolkit/core2/x2/NyARLabeling_ARToolKit_X2.java
rename to trunk/src/jp/nyatla/nyartoolkit/nymodel/x2/NyARLabeling_ARToolKit_X2.java
index deb1d32..14f2156 100644
--- a/trunk/src/jp/nyatla/nyartoolkit/core2/x2/NyARLabeling_ARToolKit_X2.java
+++ b/trunk/src/jp/nyatla/nyartoolkit/nymodel/x2/NyARLabeling_ARToolKit_X2.java
@@ -29,7 +29,7 @@
  *	<airmail(at)ebony.plala.or.jp>
  * 
  */
-package jp.nyatla.nyartoolkit.core2.x2;
+package jp.nyatla.nyartoolkit.nymodel.x2;
 
 import jp.nyatla.nyartoolkit.NyARException;
 import jp.nyatla.nyartoolkit.core.raster.*;
diff --git a/trunk/src/jp/nyatla/nyartoolkit/core2/x2/NyARRasterFilter_Edge.java b/trunk/src/jp/nyatla/nyartoolkit/nymodel/x2/NyARRasterFilter_Edge.java
similarity index 95%
rename from trunk/src/jp/nyatla/nyartoolkit/core2/x2/NyARRasterFilter_Edge.java
rename to trunk/src/jp/nyatla/nyartoolkit/nymodel/x2/NyARRasterFilter_Edge.java
index b996293..2983d89 100644
--- a/trunk/src/jp/nyatla/nyartoolkit/core2/x2/NyARRasterFilter_Edge.java
+++ b/trunk/src/jp/nyatla/nyartoolkit/nymodel/x2/NyARRasterFilter_Edge.java
@@ -29,7 +29,7 @@
  *	<airmail(at)ebony.plala.or.jp>
  * 
  */
-package jp.nyatla.nyartoolkit.core2.x2;
+package jp.nyatla.nyartoolkit.nymodel.x2;
 
 import jp.nyatla.nyartoolkit.NyARException;
 import jp.nyatla.nyartoolkit.core.raster.*;
diff --git a/trunk/src/jp/nyatla/nyartoolkit/core2/x2/NyARRotTransOptimize_X2.java b/trunk/src/jp/nyatla/nyartoolkit/nymodel/x2/NyARRotTransOptimize_X2.java
similarity index 96%
rename from trunk/src/jp/nyatla/nyartoolkit/core2/x2/NyARRotTransOptimize_X2.java
rename to trunk/src/jp/nyatla/nyartoolkit/nymodel/x2/NyARRotTransOptimize_X2.java
index 9d29f11..9d7e8ed 100644
--- a/trunk/src/jp/nyatla/nyartoolkit/core2/x2/NyARRotTransOptimize_X2.java
+++ b/trunk/src/jp/nyatla/nyartoolkit/nymodel/x2/NyARRotTransOptimize_X2.java
@@ -29,7 +29,7 @@
  *	<airmail(at)ebony.plala.or.jp>
  * 
  */
-package jp.nyatla.nyartoolkit.core2.x2;
+package jp.nyatla.nyartoolkit.nymodel.x2;
 
 
 import jp.nyatla.nyartoolkit.NyARException;
diff --git a/trunk/src/jp/nyatla/nyartoolkit/core2/x2/NyARSingleDetectMarker_X2.java b/trunk/src/jp/nyatla/nyartoolkit/nymodel/x2/NyARSingleDetectMarker_X2.java
similarity index 96%
rename from trunk/src/jp/nyatla/nyartoolkit/core2/x2/NyARSingleDetectMarker_X2.java
rename to trunk/src/jp/nyatla/nyartoolkit/nymodel/x2/NyARSingleDetectMarker_X2.java
index c71b8bd..0e72334 100644
--- a/trunk/src/jp/nyatla/nyartoolkit/core2/x2/NyARSingleDetectMarker_X2.java
+++ b/trunk/src/jp/nyatla/nyartoolkit/nymodel/x2/NyARSingleDetectMarker_X2.java
@@ -29,7 +29,7 @@
  *	<airmail(at)ebony.plala.or.jp>
  * 
  */
-package jp.nyatla.nyartoolkit.core2.x2;
+package jp.nyatla.nyartoolkit.nymodel.x2;
 
 import jp.nyatla.nyartoolkit.NyARException;
 import jp.nyatla.nyartoolkit.core.*;
diff --git a/trunk/src/jp/nyatla/nyartoolkit/core2/x2/NyARSquareDetector_X2.java b/trunk/src/jp/nyatla/nyartoolkit/nymodel/x2/NyARSquareDetector_X2.java
similarity index 96%
rename from trunk/src/jp/nyatla/nyartoolkit/core2/x2/NyARSquareDetector_X2.java
rename to trunk/src/jp/nyatla/nyartoolkit/nymodel/x2/NyARSquareDetector_X2.java
index bcd2777..ca94f45 100644
--- a/trunk/src/jp/nyatla/nyartoolkit/core2/x2/NyARSquareDetector_X2.java
+++ b/trunk/src/jp/nyatla/nyartoolkit/nymodel/x2/NyARSquareDetector_X2.java
@@ -29,7 +29,7 @@
  *	<airmail(at)ebony.plala.or.jp>
  * 
  */
-package jp.nyatla.nyartoolkit.core2.x2;
+package jp.nyatla.nyartoolkit.nymodel.x2;
 import jp.nyatla.nyartoolkit.NyARException;
 import jp.nyatla.nyartoolkit.core.labeling.*;
 import jp.nyatla.nyartoolkit.core.raster.*;
diff --git a/trunk/src/jp/nyatla/nyartoolkit/core2/x2/NyARTransMat_X2.java b/trunk/src/jp/nyatla/nyartoolkit/nymodel/x2/NyARTransMat_X2.java
similarity index 95%
rename from trunk/src/jp/nyatla/nyartoolkit/core2/x2/NyARTransMat_X2.java
rename to trunk/src/jp/nyatla/nyartoolkit/nymodel/x2/NyARTransMat_X2.java
index e7d0e61..5f14528 100644
--- a/trunk/src/jp/nyatla/nyartoolkit/core2/x2/NyARTransMat_X2.java
+++ b/trunk/src/jp/nyatla/nyartoolkit/nymodel/x2/NyARTransMat_X2.java
@@ -29,7 +29,7 @@
  *	<airmail(at)ebony.plala.or.jp>
  * 
  */
-package jp.nyatla.nyartoolkit.core2.x2;
+package jp.nyatla.nyartoolkit.nymodel.x2;
 
 import jp.nyatla.nyartoolkit.NyARException;
 import jp.nyatla.nyartoolkit.core.param.*;
diff --git a/trunk/src/jp/nyatla/nyartoolkit/sample/RawFileTest_X2.java b/trunk/src/jp/nyatla/nyartoolkit/sample/x2/RawFileTest_X2.java
similarity index 94%
rename from trunk/src/jp/nyatla/nyartoolkit/sample/RawFileTest_X2.java
rename to trunk/src/jp/nyatla/nyartoolkit/sample/x2/RawFileTest_X2.java
index 33c4681..e2e25f7 100644
--- a/trunk/src/jp/nyatla/nyartoolkit/sample/RawFileTest_X2.java
+++ b/trunk/src/jp/nyatla/nyartoolkit/sample/x2/RawFileTest_X2.java
@@ -29,7 +29,7 @@
  *	<airmail(at)ebony.plala.or.jp>
  * 
  */
-package jp.nyatla.nyartoolkit.sample;
+package jp.nyatla.nyartoolkit.sample.x2;
 
 import java.io.*;
 import java.util.*;
@@ -38,7 +38,7 @@ import jp.nyatla.nyartoolkit.core.*;
 import jp.nyatla.nyartoolkit.core.param.NyARParam;
 import jp.nyatla.nyartoolkit.core.raster.rgb.*;
 import jp.nyatla.nyartoolkit.core.transmat.*;
-import jp.nyatla.nyartoolkit.core2.x2.*;
+import jp.nyatla.nyartoolkit.nymodel.x2.*;
 
 
 /**
-- 
2.11.0