diff --git a/Manifest.txt b/Manifest.txt index c30539e..f6b6063 100644 --- a/Manifest.txt +++ b/Manifest.txt @@ -72,8 +72,6 @@ ext/opencv/cvscalar.cpp ext/opencv/cvscalar.h ext/opencv/cvseq.cpp ext/opencv/cvseq.h -ext/opencv/cvset.cpp -ext/opencv/cvset.h ext/opencv/cvsize.cpp ext/opencv/cvsize.h ext/opencv/cvsize2d32f.cpp diff --git a/ext/opencv/cvset.cpp b/ext/opencv/cvset.cpp deleted file mode 100644 index 041b826..0000000 --- a/ext/opencv/cvset.cpp +++ /dev/null @@ -1,63 +0,0 @@ -/************************************************************ - - cvseq.cpp - - - $Author: lsxi $ - - Copyright (C) 2005-2006 Masakazu Yonekura - -************************************************************/ -#include "cvset.h" -/* - * Document-class: OpenCV::CvSet - * - * Collection of nodes. - */ -__NAMESPACE_BEGIN_OPENCV -__NAMESPACE_BEGIN_CVSET - -VALUE rb_klass; - -VALUE -rb_class() -{ - return rb_klass; -} - -void -define_ruby_class() -{ - if (rb_klass) - return; - /* - * opencv = rb_define_module("OpenCV"); - * cvseq = rb_define_class_under(opencv, "CvSeq", rb_cObject); - * - * note: this comment is used by rdoc. - */ - VALUE opencv = rb_module_opencv(), cvseq = cCvSeq::rb_class(); - rb_klass = rb_define_class_under(opencv, "CvSet", cvseq); - rb_define_method(rb_klass, "active_count", RUBY_METHOD_FUNC(rb_active_count), 0); - rb_define_method(rb_klass, "free?", RUBY_METHOD_FUNC(rb_free_q), 0); -} - -/* - * ? - */ -VALUE -rb_active_count(VALUE self) -{ - return INT2FIX(CVSET(self)->active_count); -} - -/* - * ? - */ -VALUE -rb_free_q(VALUE self) -{ - return CVSET(self)->free_elems->flags < 0 ? Qtrue : Qfalse; -} - -__NAMESPACE_END_CVSET -__NAMESPACE_END_OPENCV diff --git a/ext/opencv/cvset.h b/ext/opencv/cvset.h deleted file mode 100644 index f996ed7..0000000 --- a/ext/opencv/cvset.h +++ /dev/null @@ -1,39 +0,0 @@ -/************************************************************ - - cvset.h - - - $Author: lsxi $ - - Copyright (C) 2005-2006 Masakazu Yonekura - -************************************************************/ -#ifndef RUBY_OPENCV_CVSET_H -#define RUBY_OPENCV_CVSET_H - -#include "opencv.h" - -#define __NAMESPACE_BEGIN_CVSET namespace cCvSet { -#define __NAMESPACE_END_CVSET } - -__NAMESPACE_BEGIN_OPENCV -__NAMESPACE_BEGIN_CVSET - -VALUE rb_class(); -void define_ruby_class(); - -VALUE rb_active_count(VALUE self); -VALUE rb_free_q(VALUE self); - -__NAMESPACE_END_CVSET - -inline CvSet* -CVSET(VALUE object) -{ - CvSet *ptr; - Data_Get_Struct(object, CvSet, ptr); - return ptr; -} - -__NAMESPACE_END_OPENCV - -#endif // RUBY_OPENCV_CVSET_H diff --git a/ext/opencv/opencv.cpp b/ext/opencv/opencv.cpp index d092ba1..c3d5702 100644 --- a/ext/opencv/opencv.cpp +++ b/ext/opencv/opencv.cpp @@ -620,7 +620,6 @@ extern "C" { mOpenCV::cCvSeq::define_ruby_class(); mOpenCV::mCurve::define_ruby_module(); mOpenCV::mPointSet::define_ruby_module(); - mOpenCV::cCvSet::define_ruby_class(); mOpenCV::cCvChain::define_ruby_class(); mOpenCV::cCvContour::define_ruby_class(); mOpenCV::cCvContourTree::define_ruby_class(); diff --git a/ext/opencv/opencv.h b/ext/opencv/opencv.h index 81fe7ff..ca6ab07 100644 --- a/ext/opencv/opencv.h +++ b/ext/opencv/opencv.h @@ -104,7 +104,6 @@ extern "C" { #include "cvseq.h" #include "curve.h" #include "pointset.h" -#include "cvset.h" #include "cvchain.h" #include "cvcontour.h" #include "cvcontourtree.h" diff --git a/opencv.gemspec b/opencv.gemspec index ed44f8d..b042e1b 100644 --- a/opencv.gemspec +++ b/opencv.gemspec @@ -12,7 +12,7 @@ Gem::Specification.new do |s| s.email = ["masakazu.yonekura@gmail.com", "", "pcting@gmail.com"] s.extensions = ["extconf.rb"] s.extra_rdoc_files = ["History.txt", "License.txt", "Manifest.txt"] - s.files = ["History.txt", "License.txt", "Manifest.txt", "README.rdoc", "Rakefile", "examples/convexhull.rb", "examples/snake.rb", "examples/inpaint.png", "examples/paint.rb", "examples/contours", "examples/contours/contour_retrieval_modes.rb", "examples/contours/rotated-boxes.jpg", "examples/contours/bitmap-contours.png", "examples/contours/bitmap-contours-with-labels.png", "examples/contours/bounding-box-detect-canny.rb", "examples/stuff.jpg", "examples/face_detect.rb", "examples/inpaint.rb", "examples/houghcircle.rb", "ext/opencv", "ext/opencv/mouseevent.cpp", "ext/opencv/cvcircle32f.h", "ext/opencv/cvsurfparams.cpp", "ext/opencv/cvrect.cpp", "ext/opencv/cvsurfpoint.h", "ext/opencv/cvmoments.h", "ext/opencv/cvtermcriteria.cpp", "ext/opencv/cvconvexitydefect.cpp", "ext/opencv/cvmatnd.cpp", "ext/opencv/cvavgcomp.cpp", "ext/opencv/cvconvexitydefect.h", "ext/opencv/cvseq.cpp", "ext/opencv/cvchain.cpp", "ext/opencv/cvseq.h", "ext/opencv/opencv.cpp", "ext/opencv/cvtwopoints.cpp", "ext/opencv/cvscalar.cpp", "ext/opencv/cvsparsemat.cpp", "ext/opencv/cvfont.cpp", "ext/opencv/cvpoint3d32f.h", "ext/opencv/curve.cpp", "ext/opencv/cvutils.cpp", "ext/opencv/iplimage.cpp", "ext/opencv/mouseevent.h", "ext/opencv/cvrect.h", "ext/opencv/cvsurfparams.h", "ext/opencv/trackbar.cpp", "ext/opencv/window.cpp", "ext/opencv/cvcondensation.h", "ext/opencv/opencv.h", "ext/opencv/cvsize.cpp", "ext/opencv/pointset.cpp", "ext/opencv/cvcontour.h", "ext/opencv/cvvideowriter.h", "ext/opencv/pointset.h", "ext/opencv/cvconnectedcomp.h", "ext/opencv/cvcircle32f.cpp", "ext/opencv/cvvideowriter.cpp", "ext/opencv/cvavgcomp.h", "ext/opencv/cverror.cpp", "ext/opencv/cvsize2d32f.cpp", "ext/opencv/cvpoint2d32f.h", "ext/opencv/cvcontour.cpp", "ext/opencv/cvmat.cpp", "ext/opencv/cvmemstorage.cpp", "ext/opencv/lib", "ext/opencv/lib/opencv", "ext/opencv/lib/opencv/version.rb", "ext/opencv/lib/opencv.rb", "ext/opencv/cvsurfpoint.cpp", "ext/opencv/cvfont.h", "ext/opencv/curve.h", "ext/opencv/cvslice.h", "ext/opencv/cvhumoments.h", "ext/opencv/cvhumoments.cpp", "ext/opencv/cvline.h", "ext/opencv/cvhaarclassifiercascade.cpp", "ext/opencv/gui.h", "ext/opencv/cvsize2d32f.h", "ext/opencv/cvset.cpp", "ext/opencv/cvutils.h", "ext/opencv/gui.cpp", "ext/opencv/cvmemstorage.h", "ext/opencv/cvchain.h", "ext/opencv/cvbox2d.h", "ext/opencv/cvmoments.cpp", "ext/opencv/cvscalar.h", "ext/opencv/cvsparsemat.h", "ext/opencv/cvhistogram.h", "ext/opencv/cvpoint.h", "ext/opencv/cvslice.cpp", "ext/opencv/cvcontourtree.h", "ext/opencv/cvline.cpp", "ext/opencv/cverror.h", "ext/opencv/cvcontourtree.cpp", "ext/opencv/cvcondensation.cpp", "ext/opencv/iplimage.h", "ext/opencv/cvpoint.cpp", "ext/opencv/cvbox2d.cpp", "ext/opencv/iplconvkernel.h", "ext/opencv/cvcapture.cpp", "ext/opencv/cvconnectedcomp.cpp", "ext/opencv/cvtwopoints.h", "ext/opencv/cvset.h", "ext/opencv/cvpoint3d32f.cpp", "ext/opencv/cvhaarclassifiercascade.h", "ext/opencv/cvhistogram.cpp", "ext/opencv/cvmatnd.h", "ext/opencv/cvtermcriteria.h", "ext/opencv/iplconvkernel.cpp", "ext/opencv/window.h", "ext/opencv/trackbar.h", "ext/opencv/cvpoint2d32f.cpp", "ext/opencv/cvcapture.h", "ext/opencv/cvmat.h", "ext/opencv/cvsize.h", "images/face_detect_from_lena.jpg", "images/CvMat_sobel.png", "images/CvMat_sub_rect.png", "images/CvSeq_relationmap.png", "setup/setup.mingw.rb", "setup/setup.mswin32.rb", "setup/setup.cygwin.rb", "test/test_cvline.rb", "test/test_cvchain.rb", "test/test_cvseq.rb", "test/test_iplconvkernel.rb", "test/test_cvfont.rb", "test/test_cvmoments.rb", "test/test_cvvideowriter.rb", "test/test_cvpoint2d32f.rb", "test/test_cvsize2d32f.rb", "test/runner.rb", "test/test_cvsurfparams.rb", "test/test_cvbox2d.rb", "test/test_mouseevent.rb", "test/test_curve.rb", "test/helper.rb", "test/test_window.rb", "test/test_cvpoint.rb", "test/test_preliminary.rb", "test/test_cvhaarclassifiercascade.rb", "test/test_cvsurfpoint.rb", "test/test_cvpoint3d32f.rb", "test/test_cvtwopoints.rb", "test/test_cvmat_dxt.rb", "test/test_iplimage.rb", "test/samples", "test/samples/fruits.jpg", "test/samples/messy0.jpg", "test/samples/baboon.jpg", "test/samples/lines.jpg", "test/samples/partially_blank1.jpg", "test/samples/lena.jpg", "test/samples/str-cv-rotated.jpg", "test/samples/smooth0.jpg", "test/samples/blank0.jpg", "test/samples/lena-256x256.jpg", "test/samples/airplane.jpg", "test/samples/blank5.jpg", "test/samples/contours.jpg", "test/samples/baboon200_rotated.jpg", "test/samples/one_way_train_0000.jpg", "test/samples/lena-32x32.jpg", "test/samples/lena-eyes.jpg", "test/samples/smooth4.jpg", "test/samples/blank9.jpg", "test/samples/blank1.jpg", "test/samples/blank8.jpg", "test/samples/str-ov.jpg", "test/samples/smooth2.jpg", "test/samples/cat.jpg", "test/samples/stuff.jpg", "test/samples/str-cv.jpg", "test/samples/blank3.jpg", "test/samples/baboon200.jpg", "test/samples/blank2.jpg", "test/samples/smooth1.jpg", "test/samples/partially_blank0.jpg", "test/samples/movie_sample.avi", "test/samples/messy1.jpg", "test/samples/inpaint-mask.bmp", "test/samples/smooth6.jpg", "test/samples/lena-inpaint.jpg", "test/samples/blank6.jpg", "test/samples/blank4.jpg", "test/samples/smooth3.jpg", "test/samples/blank7.jpg", "test/samples/one_way_train_0001.jpg", "test/samples/smooth5.jpg", "test/samples/haarcascade_frontalface_alt.xml.gz", "test/test_cvsize.rb", "test/test_cvcontour.rb", "test/test_cvcircle32f.rb", "test/test_cvmat_drawing.rb", "test/test_cvrect.rb", "test/test_trackbar.rb", "test/test_cvtermcriteria.rb", "test/test_opencv.rb", "test/test_cvcapture.rb", "test/test_cvmat.rb", "test/test_cvhumoments.rb", "test/test_cvscalar.rb", "test/test_cvconnectedcomp.rb", "test/test_cvavgcomp.rb", "test/test_cvmat_imageprocessing.rb", "test/test_cvslice.rb"] + s.files = ["History.txt", "License.txt", "Manifest.txt", "README.rdoc", "Rakefile", "examples/convexhull.rb", "examples/snake.rb", "examples/inpaint.png", "examples/paint.rb", "examples/contours", "examples/contours/contour_retrieval_modes.rb", "examples/contours/rotated-boxes.jpg", "examples/contours/bitmap-contours.png", "examples/contours/bitmap-contours-with-labels.png", "examples/contours/bounding-box-detect-canny.rb", "examples/stuff.jpg", "examples/face_detect.rb", "examples/inpaint.rb", "examples/houghcircle.rb", "ext/opencv", "ext/opencv/mouseevent.cpp", "ext/opencv/cvcircle32f.h", "ext/opencv/cvsurfparams.cpp", "ext/opencv/cvrect.cpp", "ext/opencv/cvsurfpoint.h", "ext/opencv/cvmoments.h", "ext/opencv/cvtermcriteria.cpp", "ext/opencv/cvconvexitydefect.cpp", "ext/opencv/cvmatnd.cpp", "ext/opencv/cvavgcomp.cpp", "ext/opencv/cvconvexitydefect.h", "ext/opencv/cvseq.cpp", "ext/opencv/cvchain.cpp", "ext/opencv/cvseq.h", "ext/opencv/opencv.cpp", "ext/opencv/cvtwopoints.cpp", "ext/opencv/cvscalar.cpp", "ext/opencv/cvsparsemat.cpp", "ext/opencv/cvfont.cpp", "ext/opencv/cvpoint3d32f.h", "ext/opencv/curve.cpp", "ext/opencv/cvutils.cpp", "ext/opencv/iplimage.cpp", "ext/opencv/mouseevent.h", "ext/opencv/cvrect.h", "ext/opencv/cvsurfparams.h", "ext/opencv/trackbar.cpp", "ext/opencv/window.cpp", "ext/opencv/cvcondensation.h", "ext/opencv/opencv.h", "ext/opencv/cvsize.cpp", "ext/opencv/pointset.cpp", "ext/opencv/cvcontour.h", "ext/opencv/cvvideowriter.h", "ext/opencv/pointset.h", "ext/opencv/cvconnectedcomp.h", "ext/opencv/cvcircle32f.cpp", "ext/opencv/cvvideowriter.cpp", "ext/opencv/cvavgcomp.h", "ext/opencv/cverror.cpp", "ext/opencv/cvsize2d32f.cpp", "ext/opencv/cvpoint2d32f.h", "ext/opencv/cvcontour.cpp", "ext/opencv/cvmat.cpp", "ext/opencv/cvmemstorage.cpp", "ext/opencv/lib", "ext/opencv/lib/opencv", "ext/opencv/lib/opencv/version.rb", "ext/opencv/lib/opencv.rb", "ext/opencv/cvsurfpoint.cpp", "ext/opencv/cvfont.h", "ext/opencv/curve.h", "ext/opencv/cvslice.h", "ext/opencv/cvhumoments.h", "ext/opencv/cvhumoments.cpp", "ext/opencv/cvline.h", "ext/opencv/cvhaarclassifiercascade.cpp", "ext/opencv/gui.h", "ext/opencv/cvsize2d32f.h", "ext/opencv/cvutils.h", "ext/opencv/gui.cpp", "ext/opencv/cvmemstorage.h", "ext/opencv/cvchain.h", "ext/opencv/cvbox2d.h", "ext/opencv/cvmoments.cpp", "ext/opencv/cvscalar.h", "ext/opencv/cvsparsemat.h", "ext/opencv/cvhistogram.h", "ext/opencv/cvpoint.h", "ext/opencv/cvslice.cpp", "ext/opencv/cvcontourtree.h", "ext/opencv/cvline.cpp", "ext/opencv/cverror.h", "ext/opencv/cvcontourtree.cpp", "ext/opencv/cvcondensation.cpp", "ext/opencv/iplimage.h", "ext/opencv/cvpoint.cpp", "ext/opencv/cvbox2d.cpp", "ext/opencv/iplconvkernel.h", "ext/opencv/cvcapture.cpp", "ext/opencv/cvconnectedcomp.cpp", "ext/opencv/cvtwopoints.h", "ext/opencv/cvpoint3d32f.cpp", "ext/opencv/cvhaarclassifiercascade.h", "ext/opencv/cvhistogram.cpp", "ext/opencv/cvmatnd.h", "ext/opencv/cvtermcriteria.h", "ext/opencv/iplconvkernel.cpp", "ext/opencv/window.h", "ext/opencv/trackbar.h", "ext/opencv/cvpoint2d32f.cpp", "ext/opencv/cvcapture.h", "ext/opencv/cvmat.h", "ext/opencv/cvsize.h", "images/face_detect_from_lena.jpg", "images/CvMat_sobel.png", "images/CvMat_sub_rect.png", "images/CvSeq_relationmap.png", "setup/setup.mingw.rb", "setup/setup.mswin32.rb", "setup/setup.cygwin.rb", "test/test_cvline.rb", "test/test_cvchain.rb", "test/test_cvseq.rb", "test/test_iplconvkernel.rb", "test/test_cvfont.rb", "test/test_cvmoments.rb", "test/test_cvvideowriter.rb", "test/test_cvpoint2d32f.rb", "test/test_cvsize2d32f.rb", "test/runner.rb", "test/test_cvsurfparams.rb", "test/test_cvbox2d.rb", "test/test_mouseevent.rb", "test/test_curve.rb", "test/helper.rb", "test/test_window.rb", "test/test_cvpoint.rb", "test/test_preliminary.rb", "test/test_cvhaarclassifiercascade.rb", "test/test_cvsurfpoint.rb", "test/test_cvpoint3d32f.rb", "test/test_cvtwopoints.rb", "test/test_cvmat_dxt.rb", "test/test_iplimage.rb", "test/samples", "test/samples/fruits.jpg", "test/samples/messy0.jpg", "test/samples/baboon.jpg", "test/samples/lines.jpg", "test/samples/partially_blank1.jpg", "test/samples/lena.jpg", "test/samples/str-cv-rotated.jpg", "test/samples/smooth0.jpg", "test/samples/blank0.jpg", "test/samples/lena-256x256.jpg", "test/samples/airplane.jpg", "test/samples/blank5.jpg", "test/samples/contours.jpg", "test/samples/baboon200_rotated.jpg", "test/samples/one_way_train_0000.jpg", "test/samples/lena-32x32.jpg", "test/samples/lena-eyes.jpg", "test/samples/smooth4.jpg", "test/samples/blank9.jpg", "test/samples/blank1.jpg", "test/samples/blank8.jpg", "test/samples/str-ov.jpg", "test/samples/smooth2.jpg", "test/samples/cat.jpg", "test/samples/stuff.jpg", "test/samples/str-cv.jpg", "test/samples/blank3.jpg", "test/samples/baboon200.jpg", "test/samples/blank2.jpg", "test/samples/smooth1.jpg", "test/samples/partially_blank0.jpg", "test/samples/movie_sample.avi", "test/samples/messy1.jpg", "test/samples/inpaint-mask.bmp", "test/samples/smooth6.jpg", "test/samples/lena-inpaint.jpg", "test/samples/blank6.jpg", "test/samples/blank4.jpg", "test/samples/smooth3.jpg", "test/samples/blank7.jpg", "test/samples/one_way_train_0001.jpg", "test/samples/smooth5.jpg", "test/samples/haarcascade_frontalface_alt.xml.gz", "test/test_cvsize.rb", "test/test_cvcontour.rb", "test/test_cvcircle32f.rb", "test/test_cvmat_drawing.rb", "test/test_cvrect.rb", "test/test_trackbar.rb", "test/test_cvtermcriteria.rb", "test/test_opencv.rb", "test/test_cvcapture.rb", "test/test_cvmat.rb", "test/test_cvhumoments.rb", "test/test_cvscalar.rb", "test/test_cvconnectedcomp.rb", "test/test_cvavgcomp.rb", "test/test_cvmat_imageprocessing.rb", "test/test_cvslice.rb"] s.homepage = %q{http://blueruby.mydns.jp/opencv} s.rdoc_options = ["--main", "README.rdoc"]