ruby-opencv 0.0.11 → 0.0.12.pre

data/ext/opencv/iplconvkernel.h

@@ -21,7 +21,7 @@ __NAMESPACE_BEGIN_IPLCONVKERNEL
 VALUE rb_class();
 VALUE rb_allocate(VALUE klass);
 
-void define_ruby_class();
+void init_ruby_class();
 VALUE rb_initialize(int argc, VALUE *argv, VALUE self);
 VALUE rb_size(VALUE self);
 VALUE rb_cols(VALUE self);

data/ext/opencv/iplimage.cpp

@@ -33,40 +33,6 @@ rb_class()
   return rb_klass;
 }
 
-void
-define_ruby_class()
-{
-  if (rb_klass)
-    return;
-  /* 
-   * opencv = rb_define_module("OpenCV");
-   * cvmat = rb_define_class_under(opencv, "CvMat", rb_cObject);
-   *
-   * note: this comment is used by rdoc.
-   */
-  VALUE opencv = rb_module_opencv();
-  VALUE cvmat = cCvMat::rb_class();
-  rb_klass = rb_define_class_under(opencv, "IplImage", cvmat);
-  rb_define_alloc_func(rb_klass, rb_allocate);
-  rb_define_singleton_method(rb_klass, "load", RUBY_METHOD_FUNC(rb_load_image), -1);
-  rb_define_private_method(rb_klass, "initialize", RUBY_METHOD_FUNC(rb_initialize), -1); 
-  rb_define_method(rb_klass, "get_roi", RUBY_METHOD_FUNC(rb_get_roi), 0);
-  rb_define_alias(rb_klass, "roi", "get_roi");
-  rb_define_method(rb_klass, "set_roi", RUBY_METHOD_FUNC(rb_set_roi), 1);
-  rb_define_alias(rb_klass, "roi=", "set_roi");
-  rb_define_method(rb_klass, "reset_roi", RUBY_METHOD_FUNC(rb_reset_roi), 0);
-  rb_define_method(rb_klass, "get_coi", RUBY_METHOD_FUNC(rb_get_coi), 0);
-  rb_define_alias(rb_klass, "coi", "get_coi");
-  rb_define_method(rb_klass, "set_coi", RUBY_METHOD_FUNC(rb_set_coi), 1);
-  rb_define_alias(rb_klass, "coi=", "set_coi");
-  rb_define_method(rb_klass, "reset_coi", RUBY_METHOD_FUNC(rb_reset_coi), 0); 
-  rb_define_method(rb_klass, "pyr_segmentation", RUBY_METHOD_FUNC(rb_pyr_segmentation), 3);
-  rb_define_method(rb_klass, "smoothness", RUBY_METHOD_FUNC(rb_smoothness), -1);
-
-  rb_define_singleton_method(rb_klass, "decode_image", RUBY_METHOD_FUNC(rb_decode_image), -1);
-  rb_define_alias(rb_singleton_class(rb_klass), "decode", "decode_image");
-}
-
 VALUE
 rb_allocate(VALUE klass)
 {
@@ -75,7 +41,7 @@ rb_allocate(VALUE klass)
 
 /*
  * call-seq:
- *   new(<i>width, height[, depth = CV_8U][, channel = 3]</i>)
+ *   new(width, height[, depth = CV_8U][, channel = 3])
  *
  * Create width * height image. Each element-value set 0.
  *
@@ -99,7 +65,7 @@ rb_initialize(int argc, VALUE *argv, VALUE self)
 
 /*
  * call-seq:
- *   IplImage::load(<i>filename[,iscolor = CV_LOAD_IMAGE_COLOR]</i>)
+ *   IplImage::load(filename[,iscolor = CV_LOAD_IMAGE_COLOR])
  *
  * Load an image from file.
  *  iscolor = CV_LOAD_IMAGE_COLOR, the loaded image is forced to be a 3-channel color image
@@ -183,8 +149,8 @@ rb_get_roi(VALUE self)
 
 /*
  * call-seq:
- *   set_roi(<i>rect</i>)
- *   set_roi(<i>rect</i>){|image| ...}
+ *   set_roi(rect)
+ *   set_roi(rect){|image| ...}
  *
  * Set ROI. <i>rect</i> should be CvRect or compatible object.
  * Return self.
@@ -244,8 +210,8 @@ rb_get_coi(VALUE self)
 
 /*
  * call-seq:
- *   set_coi(<i>coi</i>)
- *   set_coi(<i>coi</i>){|image| ...}
+ *   set_coi(coi)
+ *   set_coi(coi){|image| ...}
  *
  * Set COI. <i>coi</i> should be Fixnum.
  * Return self.
@@ -288,7 +254,7 @@ rb_reset_coi(VALUE self)
 
 /*
  * call-seq:
- *   IplImage.smoothness(<i>lowFreqRatio, blankDensity, messyDensity, highFreqRatio</i>) -> [ symbol, float, float ]
+ *   IplImage.smoothness(lowFreqRatio, blankDensity, messyDensity, highFreqRatio) -> [ symbol, float, float ]
  *
  * Determines if the image's smoothness is either, :smooth, :messy, or :blank.
  *
@@ -593,7 +559,7 @@ high_pass_range(const IplImage *pImage, float lostPercentage, int &outLow, int &
 
 /*
  * call-seq:
- *   pyr_segmentation(<i>level, threshold1, threshold2</i>) -> [iplimage, cvseq(include cvconnectedcomp)]
+ *   pyr_segmentation(level, threshold1, threshold2) -> [iplimage, cvseq(include cvconnectedcomp)]
  *
  * Does image segmentation by pyramids.
  * The pyramid builds up to the level <i>level<i>.
@@ -640,5 +606,46 @@ new_object(CvSize size, int type)
   return OPENCV_OBJECT(rb_klass, rb_cvCreateImage(size, cvIplDepth(type), CV_MAT_CN(type)));
 }
 
+void
+init_ruby_class()
+{
+#if 0
+  // For documentation using YARD
+  VALUE opencv = rb_define_module("OpenCV");
+  VALUE cvmat = rb_define_class_under(opencv, "CvMat", rb_cObject);
+#endif
+
+  if (rb_klass)
+    return;
+  /* 
+   * opencv = rb_define_module("OpenCV");
+   * cvmat = rb_define_class_under(opencv, "CvMat", rb_cObject);
+   *
+   * note: this comment is used by rdoc.
+   */
+  VALUE opencv = rb_module_opencv();
+  VALUE cvmat = cCvMat::rb_class();
+  rb_klass = rb_define_class_under(opencv, "IplImage", cvmat);
+  rb_define_alloc_func(rb_klass, rb_allocate);
+  rb_define_singleton_method(rb_klass, "load", RUBY_METHOD_FUNC(rb_load_image), -1);
+  rb_define_method(rb_klass, "initialize", RUBY_METHOD_FUNC(rb_initialize), -1); 
+  rb_define_method(rb_klass, "get_roi", RUBY_METHOD_FUNC(rb_get_roi), 0);
+  rb_define_alias(rb_klass, "roi", "get_roi");
+  rb_define_method(rb_klass, "set_roi", RUBY_METHOD_FUNC(rb_set_roi), 1);
+  rb_define_alias(rb_klass, "roi=", "set_roi");
+  rb_define_method(rb_klass, "reset_roi", RUBY_METHOD_FUNC(rb_reset_roi), 0);
+  rb_define_method(rb_klass, "get_coi", RUBY_METHOD_FUNC(rb_get_coi), 0);
+  rb_define_alias(rb_klass, "coi", "get_coi");
+  rb_define_method(rb_klass, "set_coi", RUBY_METHOD_FUNC(rb_set_coi), 1);
+  rb_define_alias(rb_klass, "coi=", "set_coi");
+  rb_define_method(rb_klass, "reset_coi", RUBY_METHOD_FUNC(rb_reset_coi), 0); 
+  rb_define_method(rb_klass, "pyr_segmentation", RUBY_METHOD_FUNC(rb_pyr_segmentation), 3);
+  rb_define_method(rb_klass, "smoothness", RUBY_METHOD_FUNC(rb_smoothness), -1);
+
+  rb_define_singleton_method(rb_klass, "decode_image", RUBY_METHOD_FUNC(rb_decode_image), -1);
+  rb_define_alias(rb_singleton_class(rb_klass), "decode", "decode_image");
+}
+
 __NAMESPACE_END_IPLIMAGE
 __NAMESPACE_END_OPENCV
+

data/ext/opencv/iplimage.h

@@ -20,7 +20,7 @@ __NAMESPACE_BEGIN_IPLIMAGE
 
 VALUE rb_class();
 
-void define_ruby_class();    
+void init_ruby_class();    
 
 VALUE rb_allocate(VALUE klass);
 VALUE rb_initialize(int argc, VALUE *argv, VALUE self);

data/ext/opencv/lbph.cpp

@@ -50,8 +50,15 @@ rb_initialize(int argc, VALUE argv[], VALUE self)
 }
 
 void
-define_ruby_class()
+init_ruby_class()
 {
+#if 0
+  // For documentation using YARD
+  VALUE opencv = rb_define_module("OpenCV");
+  VALUE alghorithm = rb_define_class_under(opencv, "Algorithm", rb_cObject);
+  VALUE face_recognizer = rb_define_class_under(opencv, "FaceRecognizer", alghorithm);
+#endif
+
   if (rb_klass)
     return;
   /* 
@@ -60,7 +67,8 @@ define_ruby_class()
    * note: this comment is used by rdoc.
    */
   VALUE opencv = rb_module_opencv();
-  rb_klass = rb_define_class_under(opencv, "LBPH", cFaceRecognizer::rb_class());
+  VALUE face_recognizer = cFaceRecognizer::rb_class();
+  rb_klass = rb_define_class_under(opencv, "LBPH", face_recognizer);
   rb_define_alloc_func(rb_klass, cFaceRecognizer::allocate_facerecognizer);
   rb_define_private_method(rb_klass, "initialize", RUBY_METHOD_FUNC(rb_initialize), -1);
 }

data/ext/opencv/lbph.h

@@ -20,7 +20,7 @@ __NAMESPACE_BEGIN_LBPH
 
 VALUE rb_class();
 
-void define_ruby_class();
+void init_ruby_class();
 VALUE rb_initialize(int argc, VALUE argv[], VALUE self);
 
 __NAMESPACE_END_LBPH

data/ext/opencv/mouseevent.cpp

@@ -12,8 +12,6 @@
  * Document-module: OpenCV::GUI::MouseEvent
  *
  * MouseEvent object.
- * have
- * see OpenCV::GUI::Window#set_mouse_callback.
  */
 __NAMESPACE_BEGIN_OPENCV
 __NAMESPACE_BEGIN_GUI
@@ -27,29 +25,6 @@ rb_class()
   return rb_klass;
 }
 
-void
-define_ruby_class()
-{
-  if (rb_klass)
-    return;
-  /* 
-   * opencv = rb_define_module("OpenCV");
-   * GUI = rb_define_module_under(opencv, "GUI");
-   * cvpoint = rb_define_class_under(opencv, "CvPoint", rb_cObject);
-   */
-  VALUE GUI = rb_module_GUI();
-  VALUE cvpoint = cCvPoint::rb_class();
-  rb_klass = rb_define_class_under(GUI, "MouseEvent", cvpoint);
-  rb_define_alloc_func(rb_klass, rb_allocate);
-  rb_define_method(rb_klass, "event", RUBY_METHOD_FUNC(rb_event), 0);
-  rb_define_method(rb_klass, "left_button?", RUBY_METHOD_FUNC(rb_left_button_q), 0);
-  rb_define_method(rb_klass, "right_button?", RUBY_METHOD_FUNC(rb_right_button_q), 0);
-  rb_define_method(rb_klass, "middle_button?", RUBY_METHOD_FUNC(rb_middle_button_q), 0);
-  rb_define_method(rb_klass, "ctrl_key?", RUBY_METHOD_FUNC(rb_ctrl_key_q), 0);
-  rb_define_method(rb_klass, "shift_key?", RUBY_METHOD_FUNC(rb_shift_key_q), 0);
-  rb_define_method(rb_klass, "alt_key?", RUBY_METHOD_FUNC(rb_alt_key_q), 0);
-}
-
 VALUE
 rb_allocate(VALUE klass)
 {
@@ -175,6 +150,36 @@ new_object(int event, int x, int y, int flags)
   return object;
 }
 
+void
+init_ruby_class()
+{
+#if 0
+  // For documentation using YARD
+  VALUE opencv = rb_define_module("OpenCV");
+  VALUE GUI = rb_define_module_under(opencv, "GUI");
+  VALUE cvpoint = rb_define_class_under(opencv, "CvPoint", rb_cObject);
+#endif
+
+  if (rb_klass)
+    return;
+  /* 
+   * opencv = rb_define_module("OpenCV");
+   * GUI = rb_define_module_under(opencv, "GUI");
+   * cvpoint = rb_define_class_under(opencv, "CvPoint", rb_cObject);
+   */
+  VALUE GUI = rb_module_GUI();
+  VALUE cvpoint = cCvPoint::rb_class();
+  rb_klass = rb_define_class_under(GUI, "MouseEvent", cvpoint);
+  rb_define_alloc_func(rb_klass, rb_allocate);
+  rb_define_method(rb_klass, "event", RUBY_METHOD_FUNC(rb_event), 0);
+  rb_define_method(rb_klass, "left_button?", RUBY_METHOD_FUNC(rb_left_button_q), 0);
+  rb_define_method(rb_klass, "right_button?", RUBY_METHOD_FUNC(rb_right_button_q), 0);
+  rb_define_method(rb_klass, "middle_button?", RUBY_METHOD_FUNC(rb_middle_button_q), 0);
+  rb_define_method(rb_klass, "ctrl_key?", RUBY_METHOD_FUNC(rb_ctrl_key_q), 0);
+  rb_define_method(rb_klass, "shift_key?", RUBY_METHOD_FUNC(rb_shift_key_q), 0);
+  rb_define_method(rb_klass, "alt_key?", RUBY_METHOD_FUNC(rb_alt_key_q), 0);
+}
+
 __NAMESPACE_END_MOUSEEVENT
 __NAMESPACE_END_GUI
 __NAMESPACE_END_OPENCV

data/ext/opencv/mouseevent.h

@@ -27,7 +27,7 @@ typedef struct MouseEvent {
 
 VALUE rb_class();
 
-void define_ruby_class();
+void init_ruby_class();
 
 VALUE rb_allocate(VALUE klass);
 

data/ext/opencv/opencv.cpp

@@ -154,7 +154,7 @@ rb_module_opencv()
 }
 
 void
-define_ruby_module()
+init_ruby_module()
 {
   if (rb_module)
     return;
@@ -320,6 +320,8 @@ define_ruby_module()
 
   /* Flags of window */
   rb_define_const(rb_module, "CV_WINDOW_AUTOSIZE", INT2FIX(CV_WINDOW_AUTOSIZE));
+  rb_define_const(rb_module, "CV_WINDOW_NORMAL", INT2FIX(CV_WINDOW_NORMAL));
+  rb_define_const(rb_module, "CV_WINDOW_OPENGL", INT2FIX(CV_WINDOW_OPENGL));
 
   /* Object detection mode */
   rb_define_const(rb_module, "CV_HAAR_DO_CANNY_PRUNING", INT2FIX(CV_HAAR_DO_CANNY_PRUNING));
@@ -705,70 +707,67 @@ extern "C" {
   {
     cvRedirectError((CvErrorCallback)mOpenCV::error_callback);
 
-    mOpenCV::define_ruby_module();
+    mOpenCV::init_ruby_module();
     
-    mOpenCV::cCvError::define_ruby_class();
-    mOpenCV::cCvPoint::define_ruby_class();
-    mOpenCV::cCvPoint2D32f::define_ruby_class();
-    mOpenCV::cCvPoint3D32f::define_ruby_class();
-    mOpenCV::cCvSize::define_ruby_class();
-    mOpenCV::cCvSize2D32f::define_ruby_class();
-    mOpenCV::cCvRect::define_ruby_class();
-    mOpenCV::cCvScalar::define_ruby_class();
-    mOpenCV::cCvSlice::define_ruby_class();
-    mOpenCV::cCvTermCriteria::define_ruby_class();
-    mOpenCV::cCvBox2D::define_ruby_class();
-    mOpenCV::cCvFont::define_ruby_class();
-    mOpenCV::cIplConvKernel::define_ruby_class();
-    mOpenCV::cCvMoments::define_ruby_class();
-    mOpenCV::cCvHuMoments::define_ruby_class();
-    mOpenCV::cCvConvexityDefect::define_ruby_class();
-
-    mOpenCV::cCvSURFPoint::define_ruby_class();
-    mOpenCV::cCvSURFParams::define_ruby_class();
+    mOpenCV::cCvError::init_ruby_class();
+    mOpenCV::cCvPoint::init_ruby_class();
+    mOpenCV::cCvPoint2D32f::init_ruby_class();
+    mOpenCV::cCvPoint3D32f::init_ruby_class();
+    mOpenCV::cCvSize::init_ruby_class();
+    mOpenCV::cCvSize2D32f::init_ruby_class();
+    mOpenCV::cCvRect::init_ruby_class();
+    mOpenCV::cCvScalar::init_ruby_class();
+    mOpenCV::cCvSlice::init_ruby_class();
+    mOpenCV::cCvTermCriteria::init_ruby_class();
+    mOpenCV::cCvBox2D::init_ruby_class();
+    mOpenCV::cCvFont::init_ruby_class();
+    mOpenCV::cIplConvKernel::init_ruby_class();
+    mOpenCV::cCvMoments::init_ruby_class();
+    mOpenCV::cCvHuMoments::init_ruby_class();
+    mOpenCV::cCvConvexityDefect::init_ruby_class();
+
+    mOpenCV::cCvSURFPoint::init_ruby_class();
+    mOpenCV::cCvSURFParams::init_ruby_class();
     
-    mOpenCV::cCvMemStorage::define_ruby_class();
-
-    mOpenCV::cCvSeq::define_ruby_class();
-    mOpenCV::mCurve::define_ruby_module();
-    mOpenCV::mPointSet::define_ruby_module();
-    mOpenCV::cCvChain::define_ruby_class();
-    mOpenCV::cCvContour::define_ruby_class();
-    mOpenCV::cCvContourTree::define_ruby_class();
-
-    mOpenCV::cCvMat::define_ruby_class();
-    mOpenCV::cIplImage::define_ruby_class();
-    mOpenCV::cCvMatND::define_ruby_class();
-    mOpenCV::cCvSparseMat::define_ruby_class();
-    mOpenCV::cCvHistogram::define_ruby_class();
-    mOpenCV::cCvCapture::define_ruby_class();
-    mOpenCV::cCvVideoWriter::define_ruby_class();
-
-    mOpenCV::cCvLine::define_ruby_class();
-    mOpenCV::cCvTwoPoints::define_ruby_class();
-    mOpenCV::cCvCircle32f::define_ruby_class();
-
-    mOpenCV::cCvConDensation::define_ruby_class();
-    mOpenCV::cCvFeatureTree::define_ruby_class();
-
-    mOpenCV::cCvConnectedComp::define_ruby_class();
-    mOpenCV::cCvAvgComp::define_ruby_class();
-    mOpenCV::cCvHaarClassifierCascade::define_ruby_class();
-
-    mOpenCV::cAlgorithm::define_ruby_class();
-    mOpenCV::cFaceRecognizer::define_ruby_class();
-    mOpenCV::cEigenFaces::define_ruby_class();
-    mOpenCV::cFisherFaces::define_ruby_class();
-    mOpenCV::cLBPH::define_ruby_class();
-
-    mOpenCV::mGUI::define_ruby_module();
-    mOpenCV::mGUI::cWindow::define_ruby_class();
-    mOpenCV::mGUI::cTrackbar::define_ruby_class();
-    mOpenCV::mGUI::cMouseEvent::define_ruby_class();
+    mOpenCV::cCvMemStorage::init_ruby_class();
+
+    mOpenCV::cCvSeq::init_ruby_class();
+    mOpenCV::mCurve::init_ruby_module();
+    mOpenCV::mPointSet::init_ruby_module();
+    mOpenCV::cCvChain::init_ruby_class();
+    mOpenCV::cCvContour::init_ruby_class();
+    mOpenCV::cCvContourTree::init_ruby_class();
+
+    mOpenCV::cCvMat::init_ruby_class();
+    mOpenCV::cIplImage::init_ruby_class();
+    mOpenCV::cCvHistogram::init_ruby_class();
+    mOpenCV::cCvCapture::init_ruby_class();
+    mOpenCV::cCvVideoWriter::init_ruby_class();
+
+    mOpenCV::cCvLine::init_ruby_class();
+    mOpenCV::cCvTwoPoints::init_ruby_class();
+    mOpenCV::cCvCircle32f::init_ruby_class();
+
+    mOpenCV::cCvFeatureTree::init_ruby_class();
+
+    mOpenCV::cCvConnectedComp::init_ruby_class();
+    mOpenCV::cCvAvgComp::init_ruby_class();
+    mOpenCV::cCvHaarClassifierCascade::init_ruby_class();
+
+    mOpenCV::cAlgorithm::init_ruby_class();
+    mOpenCV::cFaceRecognizer::init_ruby_class();
+    mOpenCV::cEigenFaces::init_ruby_class();
+    mOpenCV::cFisherFaces::init_ruby_class();
+    mOpenCV::cLBPH::init_ruby_class();
+
+    mOpenCV::mGUI::init_ruby_module();
+    mOpenCV::mGUI::cWindow::init_ruby_class();
+    mOpenCV::mGUI::cTrackbar::init_ruby_class();
+    mOpenCV::mGUI::cMouseEvent::init_ruby_class();
 
 #ifdef HAVE_ML_H
     /* feature support.
-       mOpenCV::mMachineLearning::define_ruby_module();
+       mOpenCV::mMachineLearning::init_ruby_module();
     */
 #endif
 

data/ext/opencv/opencv.h

@@ -109,8 +109,6 @@ extern "C" {
 
 #include "cvmat.h"
 #include "iplimage.h"
-#include "cvmatnd.h"
-#include "cvsparsemat.h"
 #include "cvhistogram.h"
 #include "cvcapture.h"
 #include "cvvideowriter.h"
@@ -119,8 +117,6 @@ extern "C" {
 #include "cvtwopoints.h"
 #include "cvcircle32f.h"
 
-#include "cvcondensation.h"
-
 #include "cvconnectedcomp.h"
 #include "cvavgcomp.h"
 #include "cvhaarclassifiercascade.h"
@@ -200,7 +196,7 @@ void release_object(void *ptr);
 void release_iplconvkernel_object(void *ptr);
 
 VALUE rb_module_opencv();
-void define_ruby_module();
+void init_ruby_module();
 
 // Ruby/OpenCV inline functions  
 inline CvArr*