OSDN Git Service

Merge branch 'master' into android-2.2
authorAtsuo Igarashi <atsuoigarashi@gmail.com>
Fri, 15 Apr 2011 06:26:58 +0000 (15:26 +0900)
committerAtsuo Igarashi <atsuoigarashi@gmail.com>
Fri, 15 Apr 2011 06:26:58 +0000 (15:26 +0900)
Conflicts:
lib/src/jp/nyatla/nyartoolkit/detector/NyARDetectMarker.java
readme.ja.txt
sample/java3d/.classpath
sample/java3d/src/jp/nyatla/nyartoolkit/java3d/sample/NyARJava3D.java
sample/jogl/.classpath
sample/jogl/src/jp/nyatla/nyartoolkit/jogl/sample/JavaSimpleLite.java
sample/jogl/src/jp/nyatla/nyartoolkit/jogl/sample/JavaSimpleLite2.java
sample/jogl/src/jp/nyatla/nyartoolkit/jogl/sample/JavaSimpleLite_ImageSource.java
sample/jogl/src/jp/nyatla/nyartoolkit/jogl/sample/SingleARMarker.java
sample/jogl/src/jp/nyatla/nyartoolkit/jogl/sample/SingleNyIdMarker.java
sample/sandbox/.classpath
sample/sandbox/src.dev/jp/nyatla/nyartoolkit/dev/LabelingCamera.java
sample/sandbox/src.dev/jp/nyatla/nyartoolkit/dev/NyARColorPatt_DiagonalRatio.java
sample/sandbox/src.dev/jp/nyatla/nyartoolkit/dev/NyARSquareDetector_Vector.java
sample/sandbox/src.dev/jp/nyatla/nyartoolkit/dev/OptimizeCompareTest.java
sample/sandbox/src.dev/jp/nyatla/nyartoolkit/dev/PattPickupTest.java
sample/sandbox/src.dev/jp/nyatla/nyartoolkit/dev/PattPickupTestS.java
sample/sandbox/src.dev/jp/nyatla/nyartoolkit/dev/Solver.java
sample/sandbox/src.sandbox/jp/nyatla/nyartoolkit/core/analyzer/histogram/NyARHistogramAnalyzer_PTile.java
sample/sandbox/src.sandbox/jp/nyatla/nyartoolkit/core/rasteranalyzer/NyARRasterDetector_QrCodeEdge.java
sample/sandbox/src.sandbox/jp/nyatla/nyartoolkit/core/rasteranalyzer/threshold/NyARRasterThresholdAnalyzer_DiffHistogram.java
sample/sandbox/src.sandbox/jp/nyatla/nyartoolkit/core/rasterfilter/NyARRasterFilter_Edge.java
sample/sandbox/src.sandbox/jp/nyatla/nyartoolkit/core/rasterfilter/NyARRasterOperator_Mul.java
sample/sandbox/src.sandbox/jp/nyatla/nyartoolkit/core/rasterfilter/rgb2gs/NyARRasterFilter_Rgb2Gs_CbCrCut.java
sample/sandbox/src.sandbox/jp/nyatla/nyartoolkit/core/rasterfilter/rgb2gs/NyARRasterFilter_Rgb2Gs_RgbOr.java
sample/sandbox/src.sandbox/jp/nyatla/nyartoolkit/core/types/NyARFixedFloat16Point2d.java
sample/sandbox/src.sandbox/jp/nyatla/nyartoolkit/core/types/NyARFixedFloat16Point3d.java
sample/sandbox/src.sandbox/jp/nyatla/nyartoolkit/core/types/NyARI64Linear.java
sample/sandbox/src.sandbox/jp/nyatla/nyartoolkit/core/types/NyARI64Point2d.java
sample/sandbox/src.sandbox/jp/nyatla/nyartoolkit/core/types/NyARI64Point3d.java
sample/sandbox/src.sandbox/jp/nyatla/nyartoolkit/core/types/matrix/NyARFixedFloat16Matrix33.java
sample/sandbox/src.sandbox/jp/nyatla/nyartoolkit/core/types/matrix/NyARFixedFloat24Matrix33.java
sample/sandbox/src.sandbox/jp/nyatla/nyartoolkit/core/types/matrix/NyARI64Matrix22.java
sample/sandbox/src.sandbox/jp/nyatla/nyartoolkit/core/types/matrix/NyARI64Matrix33.java
sample/sandbox/src.sandbox/jp/nyatla/nyartoolkit/sandbox/qrcode/NyARQrCodeDetector.java
sample/sandbox/src.sandbox/jp/nyatla/nyartoolkit/sandbox/qrcode/NyARQrCodeSymbolBinder.java
sample/sandbox/src.sandbox/jp/nyatla/nyartoolkit/sandbox/qrcode/NyARRasterFilter_QrAreaAverage.java
sample/sandbox/src.sandbox/jp/nyatla/nyartoolkit/sandbox/qrcode/NyARSingleQrDetector.java
sample/sandbox/src.sandbox/jp/nyatla/nyartoolkit/sandbox/qrcode/SingleQrSample.java
sample/sandbox/src.sandbox/jp/nyatla/nyartoolkit/sandbox/qrcode/SingleQrTest.java
sample/sandbox/src.sandbox/jp/nyatla/nyartoolkit/sandbox/quadx2/JavaSimpleLite_Quad.java
sample/sandbox/src.sandbox/jp/nyatla/nyartoolkit/sandbox/quadx2/NyARRasterFilter_ARTTh_Quad.java
sample/sandbox/src.sandbox/jp/nyatla/nyartoolkit/sandbox/quadx2/NyARSingleDetectMarker_Quad.java
sample/sandbox/src.sandbox/jp/nyatla/nyartoolkit/sandbox/quadx2/NyARSquareDetector_Quad.java
sample/sandbox/src.sandbox/jp/nyatla/nyartoolkit/sandbox/utils/NyARSingleEdgeFinder.java
sample/sandbox/src.sandbox/jp/nyatla/nyartoolkit/sandbox/vertexdetect/NyARVertexDetector.java
sample/sandbox/src.sandbox/jp/nyatla/nyartoolkit/sandbox/x2/JavaSimpleLite_X2.java
sample/sandbox/src.sandbox/jp/nyatla/nyartoolkit/sandbox/x2/NyARFixedFloat16Mat.java
sample/sandbox/src.sandbox/jp/nyatla/nyartoolkit/sandbox/x2/NyARFixedFloatFitVecCalculator.java
sample/sandbox/src.sandbox/jp/nyatla/nyartoolkit/sandbox/x2/NyARFixedFloatIdeal2Observ.java
sample/sandbox/src.sandbox/jp/nyatla/nyartoolkit/sandbox/x2/NyARFixedFloatObserv2IdealMap.java
sample/sandbox/src.sandbox/jp/nyatla/nyartoolkit/sandbox/x2/NyARFixedFloatPca2d.java
sample/sandbox/src.sandbox/jp/nyatla/nyartoolkit/sandbox/x2/NyARFixedFloatRotMatrix.java
sample/sandbox/src.sandbox/jp/nyatla/nyartoolkit/sandbox/x2/NyARFixedFloatRotTransOptimize_O2.java
sample/sandbox/src.sandbox/jp/nyatla/nyartoolkit/sandbox/x2/NyARFixedFloatRotVector.java
sample/sandbox/src.sandbox/jp/nyatla/nyartoolkit/sandbox/x2/NyARFixedFloatTransOffset.java
sample/sandbox/src.sandbox/jp/nyatla/nyartoolkit/sandbox/x2/NyARFixedFloatVertexCounter.java
sample/sandbox/src.sandbox/jp/nyatla/nyartoolkit/sandbox/x2/NyARSingleDetectMarker_X2.java
sample/sandbox/src.sandbox/jp/nyatla/nyartoolkit/sandbox/x2/NyARSquareDetector_X2.java
sample/sandbox/src.sandbox/jp/nyatla/nyartoolkit/sandbox/x2/NyARTransMat_X2.java
sample/sandbox/src.sandbox/jp/nyatla/nyartoolkit/sandbox/x2/NyMath.java
sample/sandbox/src.sandbox/jp/nyatla/nyartoolkit/sandbox/x2/RawFileTest_X2.java
sample/sandbox/src.sandbox/jp/nyatla/nyartoolkit/sandbox/x2/SingleARMarkerProcesser_X2.java
sample/sandbox/src.sandbox/jp/nyatla/nyartoolkit/sandbox/x2/SquareContourDetector_X2.java
sample/sandbox/src.sandbox/jp/nyatla/nyartoolkit/sandbox/x2/VisualTest.java
sample/sandbox/src.sandbox/jp/nyatla/nyartoolkit/utils/j2se/NyARRGBRaster_BufferedImage.java
src/jp/nyatla/nyartoolkit/detector/NyARSingleDetectMarker.java
src/jp/nyatla/nyartoolkit/jogl/utils/NyARGLUtil.java
utils/j2se/.classpath
utils/j2se/.project
utils/j2se/src/jp/nyatla/nyartoolkit/utils/j2se/LabelingBufferdImage.java
utils/j2se/src/jp/nyatla/nyartoolkit/utils/j2se/NyARRasterImageIO.java
utils/java3d/.classpath
utils/java3d/.project
utils/java3d/src/jp/nyatla/nyartoolkit/java3d/utils/J3dNyARParam.java
utils/java3d/src/jp/nyatla/nyartoolkit/java3d/utils/J3dNyARRaster_RGB.java
utils/java3d/src/jp/nyatla/nyartoolkit/java3d/utils/NyARSingleMarkerBehaviorHolder.java
utils/java3d/src/jp/nyatla/nyartoolkit/java3d/utils/NyARSingleMarkerBehaviorListener.java
utils/jmf/.classpath
utils/jmf/.project
utils/jmf/src/jp/nyatla/nyartoolkit/jmf/utils/JmfCaptureDevice.java
utils/jmf/src/jp/nyatla/nyartoolkit/jmf/utils/JmfCaptureDeviceList.java
utils/jmf/src/jp/nyatla/nyartoolkit/jmf/utils/JmfCaptureListener.java
utils/jmf/src/jp/nyatla/nyartoolkit/jmf/utils/JmfNyARRaster_RGB.java
utils/jmf/src/jp/nyatla/nyartoolkit/jmf/utils/MonitorCDS.java
utils/jmf/src/jp/nyatla/nyartoolkit/jmf/utils/MonitorStream.java
utils/jmf/test/jp/nyatla/nyartoolkit/jmf/utils/test/JmfCaptureTest.java
utils/jmf/test/jp/nyatla/nyartoolkit/jmf/utils/test/LabelingViewer.java
utils/jmf/test/jp/nyatla/nyartoolkit/jmf/utils/test/NyarToolkitLinkTest.java
utils/jogl/.classpath
utils/jogl/.project
utils/qt/.classpath
utils/qt/.project
utils/qt/src/jp/nyatla/nyartoolkit/qt/utils/QtCameraCapture.java
utils/qt/src/jp/nyatla/nyartoolkit/qt/utils/QtCaptureListener.java
utils/qt/src/jp/nyatla/nyartoolkit/qt/utils/QtNyARRaster_RGB.java
utils/qt/test/jp/nyatla/nyartoolkit/qt/test/NyarToolkitLinkTest.java
utils/qt/test/jp/nyatla/nyartoolkit/qt/test/QtCaptureTest.java

1  2 
lib/src/jp/nyatla/nyartoolkit/detector/NyARDetectMarker.java

@@@ -339,5 -337,29 +337,29 @@@ public class NyARDetectMarke
        {\r
                this._is_continue = i_is_continue;\r
        }\r
+ }\r
  \r
+ /** 内部クラスです。ユーザが使用することはありません*/\r
+ class NyARDetectMarkerResult\r
+ {\r
+       public int arcode_id;\r
+       public double confidence;\r
\r
+       public NyARSquare square=new NyARSquare();\r
  }\r
 -}
\r
\r
+ /** 内部クラスです。ユーザが使用することはありません*/\r
+ class NyARDetectMarkerResultStack extends NyARObjectStack<NyARDetectMarkerResult>\r
+ {\r
+       public NyARDetectMarkerResultStack(int i_length) throws NyARException\r
+       {\r
+               super();\r
+               this.initInstance(i_length,NyARDetectMarkerResult.class);\r
+               return;\r
+       }\r
+       protected NyARDetectMarkerResult createElement()\r
+       {\r
+               return new NyARDetectMarkerResult();\r
+       }       \r
++}