[backup]NyARToolkit for Java

[nyartoolkit-and/nyartoolkit-and.git] / trunk / src / jp / nyatla / nyartoolkit / detector / NyARSingleDetectMarker.java

diff --git a/trunk/src/jp/nyatla/nyartoolkit/detector/NyARSingleDetectMarker.java b/trunk/src/jp/nyatla/nyartoolkit/detector/NyARSingleDetectMarker.java
index d9e82e7..c22907c 100644 (file)
--- a/trunk/src/jp/nyatla/nyartoolkit/detector/NyARSingleDetectMarker.java
+++ b/trunk/src/jp/nyatla/nyartoolkit/detector/NyARSingleDetectMarker.java
@@ -94,23 +94,23 @@ public class NyARSingleDetectMarker extends NyARCustomSingleDetectMarker
        {\r
                final NyARRasterFilter_ARToolkitThreshold th=new NyARRasterFilter_ARToolkitThreshold(100,i_input_raster_type);\r
                INyARColorPatt patt_inst;\r
-               INyARSquareDetector sqdetect_inst;\r
+               INyARSquareContourDetector sqdetect_inst;\r
                INyARTransMat transmat_inst;\r
 \r
                switch(i_profile_id){\r
                case PF_ARTOOLKIT_COMPATIBLE:\r
                        patt_inst=new NyARColorPatt_O3(i_ref_code.getWidth(), i_ref_code.getHeight());\r
-                       sqdetect_inst=new NyARSquareDetector_ARToolKit(i_ref_param.getDistortionFactor(),i_ref_param.getScreenSize());\r
+                       sqdetect_inst=new NyARSquareContourDetector_ARToolKit(i_ref_param.getDistortionFactor(),i_ref_param.getScreenSize());\r
                        transmat_inst=new NyARTransMat_ARToolKit(i_ref_param);\r
                        break;\r
                case PF_NYARTOOLKIT_ARTOOLKIT_FITTING:\r
                        patt_inst=new NyARColorPatt_Perspective_O2(i_ref_code.getWidth(), i_ref_code.getHeight(),4,25);\r
-                       sqdetect_inst=new NyARSquareDetector_Rle(i_ref_param.getDistortionFactor(),i_ref_param.getScreenSize());\r
+                       sqdetect_inst=new NyARSquareContourDetector_Rle(i_ref_param.getDistortionFactor(),i_ref_param.getScreenSize());\r
                        transmat_inst=new NyARTransMat_ARToolKit(i_ref_param);\r
                        break;\r
                case PF_NYARTOOLKIT://default\r
                        patt_inst=new NyARColorPatt_Perspective_O2(i_ref_code.getWidth(), i_ref_code.getHeight(),4,25);\r
-                       sqdetect_inst=new NyARSquareDetector_Rle(i_ref_param.getDistortionFactor(),i_ref_param.getScreenSize());\r
+                       sqdetect_inst=new NyARSquareContourDetector_Rle(i_ref_param.getDistortionFactor(),i_ref_param.getScreenSize());\r
                        transmat_inst=new NyARTransMat(i_ref_param);\r
                        break;\r
                default:\r