ruby-opencv 0.0.11 → 0.0.12.pre

data/ext/opencv/cvtermcriteria.h

@@ -20,7 +20,7 @@ __NAMESPACE_BEGIN_CVTERMCRITERIA
 
 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/cvtwopoints.cpp

@@ -9,7 +9,7 @@
 ************************************************************/
 #include "cvtwopoints.h"
 /*
- * Document-class: OpenCV::CvTwopoints
+ * Document-class: OpenCV::CvTwoPoints
  *
  * This class means one twopoints on X axis Y axis. 
  * X and Y takes the value of the Fixnum. see also CvTwopoints2D32F
@@ -31,27 +31,6 @@ rb_class()
   return rb_klass;
 }
 
-void
-define_ruby_class()
-{
-  if (rb_klass)
-    return;
-  /* 
-   * opencv = rb_define_module("OpenCV");
-   * 
-   * note: this comment is used by rdoc.
-   */
-  VALUE opencv = rb_module_opencv();
-  
-  rb_klass = rb_define_class_under(opencv, "CvTwoPoints", rb_cObject);
-  rb_define_alloc_func(rb_klass, rb_allocate);
-  rb_define_method(rb_klass, "point1", RUBY_METHOD_FUNC(rb_point1), 0);
-  rb_define_method(rb_klass, "point2", RUBY_METHOD_FUNC(rb_point2), 0);
-  rb_define_method(rb_klass, "[]", RUBY_METHOD_FUNC(rb_aref), 1);
-  rb_define_method(rb_klass, "to_ary", RUBY_METHOD_FUNC(rb_to_ary), 0);
-  rb_define_alias(rb_klass, "to_a", "to_ary");
-}
-
 VALUE
 rb_allocate(VALUE klass)
 {
@@ -112,5 +91,32 @@ rb_to_ary(VALUE self)
   return rb_ary_new3(2, rb_point1(self), rb_point2(self));
 }
 
+void
+init_ruby_class()
+{
+#if 0
+  // For documentation using YARD
+  VALUE opencv = rb_define_module("OpenCV");
+#endif
+
+  if (rb_klass)
+    return;
+  /* 
+   * opencv = rb_define_module("OpenCV");
+   * 
+   * note: this comment is used by rdoc.
+   */
+  VALUE opencv = rb_module_opencv();
+  
+  rb_klass = rb_define_class_under(opencv, "CvTwoPoints", rb_cObject);
+  rb_define_alloc_func(rb_klass, rb_allocate);
+  rb_define_method(rb_klass, "point1", RUBY_METHOD_FUNC(rb_point1), 0);
+  rb_define_method(rb_klass, "point2", RUBY_METHOD_FUNC(rb_point2), 0);
+  rb_define_method(rb_klass, "[]", RUBY_METHOD_FUNC(rb_aref), 1);
+  rb_define_method(rb_klass, "to_ary", RUBY_METHOD_FUNC(rb_to_ary), 0);
+  rb_define_alias(rb_klass, "to_a", "to_ary");
+}
+
 __NAMESPACE_END_CVTWOPOINTS
 __NAMESPACE_END_OPENCV
+

data/ext/opencv/cvtwopoints.h

@@ -26,7 +26,7 @@ __NAMESPACE_BEGIN_CVTWOPOINTS
 
 VALUE rb_class();
 
-void define_ruby_class();
+void init_ruby_class();
 
 VALUE rb_allocate(VALUE klass);
 

data/ext/opencv/cvvideowriter.cpp

@@ -26,27 +26,10 @@ rb_class()
   return rb_klass;
 }
 
-void
-define_ruby_class()
-{
-  if (rb_klass)
-    return;
-  /* 
-   * opencv = rb_define_module("OpenCV");
-   * 
-   * note: this comment is used by rdoc.
-   */
-  VALUE opencv = rb_module_opencv();
-  rb_klass = rb_define_class_under(opencv, "CvVideoWriter", rb_cObject);
-  rb_define_private_method(rb_klass, "initialize", RUBY_METHOD_FUNC(rb_initialize), -1);
-  rb_define_method(rb_klass, "write", RUBY_METHOD_FUNC(rb_write), 1);
-  rb_define_method(rb_klass, "close", RUBY_METHOD_FUNC(rb_close), 0);
-}
-
 /*
  * call-seq:
- *   CvVideoWriter.new(<i>filname, fourcc, fps, size[, is_color]</i>) -> cvvideowriter
- *   CvVideoWriter.new(<i>filname, fourcc, fps, size[, is_color]</i>){|vw| ... } -> nil
+ *   CvVideoWriter.new(filname, fourcc, fps, size[, is_color]) -> cvvideowriter
+ *   CvVideoWriter.new(filname, fourcc, fps, size[, is_color]){|vw| ... } -> nil
  *
  * Open new video writer. If block given, writer is closed automatically when end of block.
  * 
@@ -98,7 +81,7 @@ rb_initialize(int argc, VALUE *argv, VALUE self)
 
 /*
  * call-seq:
- *   write(<i>frame</i>)
+ *   write(frame)
  *
  * Write image as frame of video stream.
  * <i>frame</i> should be IplImage
@@ -132,6 +115,28 @@ rb_close(VALUE self)
   return Qnil;
 }
 
+void
+init_ruby_class()
+{
+#if 0
+  // For documentation using YARD
+  VALUE opencv = rb_define_module("OpenCV");
+#endif
+
+  if (rb_klass)
+    return;
+  /* 
+   * opencv = rb_define_module("OpenCV");
+   * 
+   * note: this comment is used by rdoc.
+   */
+  VALUE opencv = rb_module_opencv();
+  rb_klass = rb_define_class_under(opencv, "CvVideoWriter", rb_cObject);
+  rb_define_method(rb_klass, "initialize", RUBY_METHOD_FUNC(rb_initialize), -1);
+  rb_define_method(rb_klass, "write", RUBY_METHOD_FUNC(rb_write), 1);
+  rb_define_method(rb_klass, "close", RUBY_METHOD_FUNC(rb_close), 0);
+}
 
 __NAMESPACE_END_CVVIDEOWRITER
 __NAMESPACE_END_OPENCV
+

data/ext/opencv/cvvideowriter.h

@@ -20,7 +20,7 @@ __NAMESPACE_BEGIN_CVVIDEOWRITER
 
 VALUE rb_class();
 
-void define_ruby_class();
+void init_ruby_class();
 
 VALUE rb_initialize(int argc, VALUE *argv, VALUE self);
 VALUE rb_write(VALUE self, VALUE frame);

data/ext/opencv/eigenfaces.cpp

@@ -47,8 +47,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;
   /* 
@@ -57,7 +64,8 @@ define_ruby_class()
    * note: this comment is used by rdoc.
    */
   VALUE opencv = rb_module_opencv();
-  rb_klass = rb_define_class_under(opencv, "EigenFaces", cFaceRecognizer::rb_class());
+  VALUE face_recognizer = cFaceRecognizer::rb_class();
+  rb_klass = rb_define_class_under(opencv, "EigenFaces", 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/eigenfaces.h

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

data/ext/opencv/facerecognizer.cpp

@@ -18,20 +18,19 @@ __NAMESPACE_BEGIN_FACERECOGNIZER
 
 VALUE rb_klass;
 
-std::map< long, cv::Ptr<cv::FaceRecognizer> > ptr_guard_map;
+std::map<void*, cv::Ptr<cv::FaceRecognizer> > ptr_guard_map;
 
 void
 guard_facerecognizer(void* data_ptr, cv::Ptr<cv::FaceRecognizer> ptr)
 {
-  ptr_guard_map[(long)data_ptr] = ptr;
+  ptr_guard_map[data_ptr] = ptr;
 }
 
 void
-release_facerecognizer(void *ptr)
+release_facerecognizer(void *data_ptr)
 {
-  long key = (long)ptr;
-  ptr_guard_map[key].release();
-  ptr_guard_map.erase(key);
+  ptr_guard_map[data_ptr].release();
+  ptr_guard_map.erase(data_ptr);
 }
 
 VALUE
@@ -153,8 +152,14 @@ rb_load(VALUE self, VALUE filename)
 }
 
 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);
+#endif
+
   if (rb_klass)
     return;
   /* 
@@ -163,7 +168,8 @@ define_ruby_class()
    * note: this comment is used by rdoc.
    */
   VALUE opencv = rb_module_opencv();
-  rb_klass = rb_define_class_under(opencv, "FaceRecognizer", cAlgorithm::rb_class());
+  VALUE alghorithm = cAlgorithm::rb_class();
+  rb_klass = rb_define_class_under(opencv, "FaceRecognizer", alghorithm);
   rb_define_method(rb_klass, "train", RUBY_METHOD_FUNC(rb_train), 2);
   rb_define_method(rb_klass, "predict", RUBY_METHOD_FUNC(rb_predict), 1);
   rb_define_method(rb_klass, "save", RUBY_METHOD_FUNC(rb_save), 1);
@@ -172,3 +178,4 @@ define_ruby_class()
 
 __NAMESPACE_END_FACERECOGNIZER
 __NAMESPACE_END_OPENCV
+

data/ext/opencv/facerecognizer.h

@@ -20,14 +20,14 @@ __NAMESPACE_BEGIN_FACERECOGNIZER
 
 VALUE rb_class();
 
-void define_ruby_class();
+void init_ruby_class();
 VALUE rb_train(VALUE self, VALUE src, VALUE labels);
 VALUE rb_predict(VALUE self, VALUE src);
 VALUE rb_save(VALUE self, VALUE filename);
 VALUE rb_load(VALUE self, VALUE filename);
 
 void guard_facerecognizer(void* data_ptr, cv::Ptr<cv::FaceRecognizer> ptr);
-void release_facerecognizer(void *ptr);
+void release_facerecognizer(void *data_ptr);
 VALUE allocate_facerecognizer(VALUE klass);
 
 __NAMESPACE_END_FACERECOGNIZER

data/ext/opencv/fisherfaces.cpp

@@ -47,8 +47,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;
   /* 
@@ -57,7 +64,8 @@ define_ruby_class()
    * note: this comment is used by rdoc.
    */
   VALUE opencv = rb_module_opencv();
-  rb_klass = rb_define_class_under(opencv, "FisherFaces", cFaceRecognizer::rb_class());
+  VALUE face_recognizer = cFaceRecognizer::rb_class();
+  rb_klass = rb_define_class_under(opencv, "FisherFaces", 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/fisherfaces.h

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

data/ext/opencv/gui.cpp

@@ -10,9 +10,6 @@
 #include "gui.h"
 /*
  * Document-module: OpenCV::GUI
- *
- * OpenCV simple GUI interface. Provides Window, Trackbar.
- * This GUI work on GTK or Microsoft Windows native GUI.
  */
 __NAMESPACE_BEGIN_OPENCV
 __NAMESPACE_BEGIN_GUI
@@ -25,28 +22,14 @@ rb_module_GUI()
   return rb_module;
 }
 
-void
-define_ruby_module()
-{
-  if (rb_module)
-    return;
-  /* 
-   * opencv = rb_define_module("OpenCV");      
-   *
-   * note: this comment is used by rdoc.
-   */
-  VALUE opencv = rb_module_opencv();
-  rb_module = rb_define_module_under(opencv, "GUI");
-  rb_define_singleton_method(rb_module, "wait_key", RUBY_METHOD_FUNC(rb_wait_key), -1);
-}
-
 /*
- * call-seq:
- *   wait_key(<i>[delay]</i>) -> int or nil
+ * Waits for a pressed key.
  *
- * Waits for a pressed key each GUI wedget.
- * Return the code of the pressed key or nil if no key were pressed until the specified timeout has elapsed.
- * <i>delay</i> should be Fixnum. Wait <i>delay</i> millisecond.
+ * @overload wait_key(delay = 0)
+ *   @param delay [Integer] Delay in milliseconds. 0 is the special value that means "forever".
+ * @return [Number] The code of the pressed key or <tt>nil</tt> if no key was pressed
+ *   before the specified time had elapsed.
+ * @opencv_func cvWaitKey
  */
 VALUE
 rb_wait_key(int argc, VALUE *argv, VALUE self)
@@ -63,6 +46,26 @@ rb_wait_key(int argc, VALUE *argv, VALUE self)
   return (keycode < 0) ? Qnil : INT2NUM(keycode);
 }
 
+void
+init_ruby_module()
+{
+#if 0
+  // For documentation using YARD
+  VALUE opencv = rb_define_module("OpenCV");
+#endif
+
+  if (rb_module)
+    return;
+  /* 
+   * opencv = rb_define_module("OpenCV");      
+   *
+   * note: this comment is used by rdoc.
+   */
+  VALUE opencv = rb_module_opencv();
+  rb_module = rb_define_module_under(opencv, "GUI");
+  rb_define_singleton_method(rb_module, "wait_key", RUBY_METHOD_FUNC(rb_wait_key), -1);
+}
+
 __NAMESPACE_END_GUI
 __NAMESPACE_END_OPENCV
 

data/ext/opencv/gui.h

@@ -19,7 +19,7 @@ __NAMESPACE_BEGIN_OPENCV
 __NAMESPACE_BEGIN_GUI
 
 VALUE rb_module_GUI();
-void define_ruby_module();
+void init_ruby_module();
 
 VALUE rb_wait_key(int argc, VALUE *argv, VALUE self);
 

data/ext/opencv/iplconvkernel.cpp

@@ -29,30 +29,6 @@ rb_class()
   return rb_klass;
 }
 
-void
-define_ruby_class()
-{
-  if (rb_klass)
-    return;
-  /* 
-   * opencv = rb_define_module("OpenCV");
-   * 
-   * note: this comment is used by rdoc.
-   */
-  VALUE opencv = rb_module_opencv();  
-  rb_klass = rb_define_class_under(opencv, "IplConvKernel", rb_cObject);
-  rb_define_alloc_func(rb_klass, rb_allocate);
-
-  rb_define_private_method(rb_klass, "initialize", RUBY_METHOD_FUNC(rb_initialize), -1);
-  rb_define_method(rb_klass, "size", RUBY_METHOD_FUNC(rb_size), 0);
-  rb_define_method(rb_klass, "cols", RUBY_METHOD_FUNC(rb_cols), 0);
-  rb_define_alias(rb_klass, "columns", "cols");
-  rb_define_method(rb_klass, "rows", RUBY_METHOD_FUNC(rb_rows), 0);
-  rb_define_method(rb_klass, "anchor", RUBY_METHOD_FUNC(rb_anchor), 0);
-  rb_define_method(rb_klass, "anchor_x", RUBY_METHOD_FUNC(rb_anchor_x), 0);
-  rb_define_method(rb_klass, "anchor_y", RUBY_METHOD_FUNC(rb_anchor_y), 0);
-}
-
 VALUE
 rb_allocate(VALUE klass)
 {
@@ -188,5 +164,35 @@ rb_anchor_y(VALUE self)
   return INT2NUM(IPLCONVKERNEL(self)->anchorY);
 }
 
+void
+init_ruby_class()
+{
+#if 0
+  // For documentation using YARD
+  VALUE opencv = rb_define_module("OpenCV");
+#endif
+
+  if (rb_klass)
+    return;
+  /* 
+   * opencv = rb_define_module("OpenCV");
+   * 
+   * note: this comment is used by rdoc.
+   */
+  VALUE opencv = rb_module_opencv();  
+  rb_klass = rb_define_class_under(opencv, "IplConvKernel", rb_cObject);
+  rb_define_alloc_func(rb_klass, rb_allocate);
+
+  rb_define_method(rb_klass, "initialize", RUBY_METHOD_FUNC(rb_initialize), -1);
+  rb_define_method(rb_klass, "size", RUBY_METHOD_FUNC(rb_size), 0);
+  rb_define_method(rb_klass, "cols", RUBY_METHOD_FUNC(rb_cols), 0);
+  rb_define_alias(rb_klass, "columns", "cols");
+  rb_define_method(rb_klass, "rows", RUBY_METHOD_FUNC(rb_rows), 0);
+  rb_define_method(rb_klass, "anchor", RUBY_METHOD_FUNC(rb_anchor), 0);
+  rb_define_method(rb_klass, "anchor_x", RUBY_METHOD_FUNC(rb_anchor_x), 0);
+  rb_define_method(rb_klass, "anchor_y", RUBY_METHOD_FUNC(rb_anchor_y), 0);
+}
+
 __NAMESPACE_END_IPLCONVKERNEL
 __NAMESPACE_END_OPENCV
+