ruby-opencv 0.0.9-x86-mswin32 → 0.0.10.pre-x86-mswin32

data/ext/opencv/cvcondensation.h

@@ -1,49 +1,49 @@
-/************************************************************
-
-   cvcondensation.h -
-
-   $Author: lsxi $
-
-   Copyright (C) 2005-2006 Masakazu Yonekura
-
-************************************************************/
-#ifndef RUBY_OPENCV_CVCONDENSATION_H
-#define RUBY_OPENCV_CVCONDENSATION_H
-
-#include "opencv.h"
-
-#define __NAMESPACE_BEGIN_CVCONDENSATION namespace cCvConDensation {
-#define __NAMESPACE_END_CVCONDENSATION }
-
-__NAMESPACE_BEGIN_OPENCV
-__NAMESPACE_BEGIN_CVCONDENSATION
-
-VALUE rb_class();
-void define_ruby_class();
-
-VALUE rb_dp(VALUE self);
-VALUE rb_mp(VALUE self);
-VALUE rb_dynamic_matrix(VALUE self);
-VALUE rb_state(VALUE self);
-VALUE rb_confidence(VALUE self);
-VALUE rb_cumulative(VALUE self);
-VALUE rb_samples_num(VALUE self);
-
-VALUE rb_init_sample_set(VALUE self, VALUE lower, VALUE upper);
-VALUE rb_update_by_time(VALUE self);
-VALUE rb_each_sample(VALUE self);
-VALUE rb_calculate_confidence(VALUE self);
-
-__NAMESPACE_END_CVCONDENSATION
-
-inline CvConDensation*
-CVCONDENSATION(VALUE object)
-{
-  CvConDensation *ptr;
-  Data_Get_Struct(object, CvConDensation, ptr);
-  return ptr;
-}
-
-__NAMESPACE_END_OPENCV
-
-#endif // RUBY_OPENCV_CVCONDENSATION_H
+/************************************************************
+
+   cvcondensation.h -
+
+   $Author: lsxi $
+
+   Copyright (C) 2005-2006 Masakazu Yonekura
+
+************************************************************/
+#ifndef RUBY_OPENCV_CVCONDENSATION_H
+#define RUBY_OPENCV_CVCONDENSATION_H
+
+#include "opencv.h"
+
+#define __NAMESPACE_BEGIN_CVCONDENSATION namespace cCvConDensation {
+#define __NAMESPACE_END_CVCONDENSATION }
+
+__NAMESPACE_BEGIN_OPENCV
+__NAMESPACE_BEGIN_CVCONDENSATION
+
+VALUE rb_class();
+void define_ruby_class();
+
+VALUE rb_dp(VALUE self);
+VALUE rb_mp(VALUE self);
+VALUE rb_dynamic_matrix(VALUE self);
+VALUE rb_state(VALUE self);
+VALUE rb_confidence(VALUE self);
+VALUE rb_cumulative(VALUE self);
+VALUE rb_samples_num(VALUE self);
+
+VALUE rb_init_sample_set(VALUE self, VALUE lower, VALUE upper);
+VALUE rb_update_by_time(VALUE self);
+VALUE rb_each_sample(VALUE self);
+VALUE rb_calculate_confidence(VALUE self);
+
+__NAMESPACE_END_CVCONDENSATION
+
+inline CvConDensation*
+CVCONDENSATION(VALUE object)
+{
+  CvConDensation *ptr;
+  Data_Get_Struct(object, CvConDensation, ptr);
+  return ptr;
+}
+
+__NAMESPACE_END_OPENCV
+
+#endif // RUBY_OPENCV_CVCONDENSATION_H

data/ext/opencv/cvmat.cpp

@@ -3945,9 +3945,9 @@ rb_resize(int argc, VALUE *argv, VALUE self)
 VALUE
 rb_warp_affine(int argc, VALUE *argv, VALUE self)
 {
-  VALUE map_matrix, flags_val, option, fill_value;
+  VALUE map_matrix, flags_val, fill_value;
   VALUE dest = Qnil;
-  if (rb_scan_args(argc, argv, "13", &map_matrix, &flags_val, &option, &fill_value) < 4)
+  if (rb_scan_args(argc, argv, "12", &map_matrix, &flags_val, &fill_value) < 3)
     fill_value = INT2FIX(0);
   CvArr* self_ptr = CVARR(self);
   int flags = NIL_P(flags_val) ? (CV_INTER_LINEAR | CV_WARP_FILL_OUTLIERS) : NUM2INT(flags_val);
@@ -4755,7 +4755,7 @@ rb_flood_fill_bang(int argc, VALUE *argv, VALUE self)
   try {
     CvSize size = cvGetSize(self_ptr);
     // TODO: Change argument format to set mask
-    mask = new_object(size.width + 2, size.height + 2, CV_MAKETYPE(CV_8U, 1));
+    mask = new_object(size.height + 2, size.width + 2, CV_MAKETYPE(CV_8U, 1));
     CvMat* mask_ptr = CVMAT(mask);
     cvSetZero(mask_ptr);
     cvFloodFill(self_ptr,
@@ -5261,11 +5261,11 @@ rb_match_template(int argc, VALUE *argv, VALUE self)
  * Compares two shapes(self and object). <i>object</i> should be CvMat or CvContour.
  *
  * A - object1, B - object2:
- * * method=CV_CONTOUR_MATCH_I1
+ * * method=CV_CONTOURS_MATCH_I1
  *     I1(A,B)=sumi=1..7abs(1/mAi - 1/mBi)
- * * method=CV_CONTOUR_MATCH_I2
+ * * method=CV_CONTOURS_MATCH_I2
  *     I2(A,B)=sumi=1..7abs(mAi - mBi)
- * * method=CV_CONTOUR_MATCH_I3
+ * * method=CV_CONTOURS_MATCH_I3
  *     I3(A,B)=sumi=1..7abs(mAi - mBi)/abs(mAi)
  */
 VALUE

data/ext/opencv/cvmatnd.cpp

@@ -1,44 +1,44 @@
-/***********************************************************
-
-   cvmatnd.cpp -
-
-   $Author: lsxi $
-
-   Copyright (C) 2007 Masakazu Yonekura
-
-************************************************************/
-#include "cvmatnd.h"
-/*
- * Document-class: OpenCV::CvMatND
- *
- */
-__NAMESPACE_BEGIN_OPENCV
-__NAMESPACE_BEGIN_CVMATND
-
-VALUE rb_klass;
-
-VALUE
-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(), cvmat = cCvMat::rb_class();
-  
-  rb_klass = rb_define_class_under(opencv, "CvMatND", cvmat);
-}
-
-__NAMESPACE_END_CVMATND
-__NAMESPACE_END_OPENCV
-
+/***********************************************************
+
+   cvmatnd.cpp -
+
+   $Author: lsxi $
+
+   Copyright (C) 2007 Masakazu Yonekura
+
+************************************************************/
+#include "cvmatnd.h"
+/*
+ * Document-class: OpenCV::CvMatND
+ *
+ */
+__NAMESPACE_BEGIN_OPENCV
+__NAMESPACE_BEGIN_CVMATND
+
+VALUE rb_klass;
+
+VALUE
+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(), cvmat = cCvMat::rb_class();
+  
+  rb_klass = rb_define_class_under(opencv, "CvMatND", cvmat);
+}
+
+__NAMESPACE_END_CVMATND
+__NAMESPACE_END_OPENCV
+

data/ext/opencv/cvmatnd.h

@@ -1,28 +1,28 @@
-/************************************************************
-
-   cvmatnd.h -
-
-   $Author: lsxi $
-
-   Copyright (C) 2007 Masakazu Yonekura
-
-************************************************************/
-#ifndef RUBY_OPENCV_CVMATND_H
-#define RUBY_OPENCV_CVMATND_H
-
-#include "opencv.h"
-
-#define __NAMESPACE_BEGIN_CVMATND namespace cCvMatND {
-#define __NAMESPACE_END_CVMATND }
-
-__NAMESPACE_BEGIN_OPENCV
-__NAMESPACE_BEGIN_CVMATND
-
-VALUE rb_class();
-
-void define_ruby_class();
-
-__NAMESPACE_END_CVMATND
-__NAMESPACE_END_OPENCV
-
-#endif // RUBY_OPENCV_CVMATND_H
+/************************************************************
+
+   cvmatnd.h -
+
+   $Author: lsxi $
+
+   Copyright (C) 2007 Masakazu Yonekura
+
+************************************************************/
+#ifndef RUBY_OPENCV_CVMATND_H
+#define RUBY_OPENCV_CVMATND_H
+
+#include "opencv.h"
+
+#define __NAMESPACE_BEGIN_CVMATND namespace cCvMatND {
+#define __NAMESPACE_END_CVMATND }
+
+__NAMESPACE_BEGIN_OPENCV
+__NAMESPACE_BEGIN_CVMATND
+
+VALUE rb_class();
+
+void define_ruby_class();
+
+__NAMESPACE_END_CVMATND
+__NAMESPACE_END_OPENCV
+
+#endif // RUBY_OPENCV_CVMATND_H

data/ext/opencv/cvmemstorage.cpp

@@ -1,68 +1,68 @@
-/************************************************************
-
-   cvmemstorage.cpp -
-
-   $Author: lsxi $
-
-   Copyright (C) 2005 Masakazu Yonekura
-
-************************************************************/
-#include "cvmemstorage.h"
-/*
- * Document-class: OpenCV::CvMemStorage
- *
- * Internal memory management class used by CvSeq.
- */
-__NAMESPACE_BEGIN_OPENCV
-__NAMESPACE_BEGIN_CVMEMSTORAGE
-
-VALUE rb_klass;
-
-VALUE
-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, "CvMemStorage", rb_cObject);
-}
-
-VALUE
-rb_allocate(VALUE klass)
-{
-  CvMemStorage *storage = rb_cvCreateMemStorage(0);
-  return Data_Wrap_Struct(klass, 0, cvmemstorage_free, storage);
-}
-
-void
-cvmemstorage_free(void *ptr)
-{
-  try {
-    cvReleaseMemStorage((CvMemStorage**)&ptr);
-  }
-  catch (cv::Exception& e) {
-    raise_cverror(e);
-  }
-}
-
-VALUE
-new_object(int blocksize)
-{
-  CvMemStorage *storage = rb_cvCreateMemStorage(blocksize);
-  return Data_Wrap_Struct(rb_klass, 0, cvmemstorage_free, storage);
-}
-
-
-__NAMESPACE_END_CVMEMSTORAGE
-__NAMESPACE_END_OPENCV
+/************************************************************
+
+   cvmemstorage.cpp -
+
+   $Author: lsxi $
+
+   Copyright (C) 2005 Masakazu Yonekura
+
+************************************************************/
+#include "cvmemstorage.h"
+/*
+ * Document-class: OpenCV::CvMemStorage
+ *
+ * Internal memory management class used by CvSeq.
+ */
+__NAMESPACE_BEGIN_OPENCV
+__NAMESPACE_BEGIN_CVMEMSTORAGE
+
+VALUE rb_klass;
+
+VALUE
+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, "CvMemStorage", rb_cObject);
+}
+
+VALUE
+rb_allocate(VALUE klass)
+{
+  CvMemStorage *storage = rb_cvCreateMemStorage(0);
+  return Data_Wrap_Struct(klass, 0, cvmemstorage_free, storage);
+}
+
+void
+cvmemstorage_free(void *ptr)
+{
+  try {
+    cvReleaseMemStorage((CvMemStorage**)&ptr);
+  }
+  catch (cv::Exception& e) {
+    raise_cverror(e);
+  }
+}
+
+VALUE
+new_object(int blocksize)
+{
+  CvMemStorage *storage = rb_cvCreateMemStorage(blocksize);
+  return Data_Wrap_Struct(rb_klass, 0, cvmemstorage_free, storage);
+}
+
+
+__NAMESPACE_END_CVMEMSTORAGE
+__NAMESPACE_END_OPENCV

data/ext/opencv/cvmemstorage.h

@@ -1,53 +1,53 @@
-/************************************************************
-
-   cvmemstorage.h -
-
-   $Author: lsxi $
-
-   Copyright (C) 2005 Masakazu Yonekura
-
-************************************************************/
-#ifndef RUBY_OPENCV_CVMEMSTORAGE_H
-#define RUBY_OPENCV_CVMEMSTORAGE_H
-
-#include "opencv.h"
-
-#define __NAMESPACE_BEGIN_CVMEMSTORAGE namespace cCvMemStorage {
-#define __NAMESPACE_END_CVMEMSTORAGE }
-
-__NAMESPACE_BEGIN_OPENCV
-__NAMESPACE_BEGIN_CVMEMSTORAGE
-    
-void define_ruby_class();
-
-VALUE rb_class();
-VALUE rb_allocate(VALUE klass);
-void cvmemstorage_free(void *ptr);
-
-VALUE new_object(int blocksize = 0);
-
-__NAMESPACE_END_CVMEMSTORAGE
-
-inline CvMemStorage*
-CVMEMSTORAGE(VALUE object)
-{
-  CvMemStorage *ptr;
-  Data_Get_Struct(object, CvMemStorage, ptr);
-  return ptr;
-}
-
-inline VALUE
-CHECK_CVMEMSTORAGE(VALUE object)
-{
-  if (rb_obj_is_kind_of(object, cCvMemStorage::rb_class()))
-    return object;
-  else {
-    if (!NIL_P(object))
-      rb_warn("invalid CvMemStorage object given. allocate new memory storage automatically.");
-    return cCvMemStorage::new_object();
-  }
-}
-
-__NAMESPACE_END_OPENCV
-
-#endif // RUBY_OPENCV_CVMEMSTORAGE_H
+/************************************************************
+
+   cvmemstorage.h -
+
+   $Author: lsxi $
+
+   Copyright (C) 2005 Masakazu Yonekura
+
+************************************************************/
+#ifndef RUBY_OPENCV_CVMEMSTORAGE_H
+#define RUBY_OPENCV_CVMEMSTORAGE_H
+
+#include "opencv.h"
+
+#define __NAMESPACE_BEGIN_CVMEMSTORAGE namespace cCvMemStorage {
+#define __NAMESPACE_END_CVMEMSTORAGE }
+
+__NAMESPACE_BEGIN_OPENCV
+__NAMESPACE_BEGIN_CVMEMSTORAGE
+    
+void define_ruby_class();
+
+VALUE rb_class();
+VALUE rb_allocate(VALUE klass);
+void cvmemstorage_free(void *ptr);
+
+VALUE new_object(int blocksize = 0);
+
+__NAMESPACE_END_CVMEMSTORAGE
+
+inline CvMemStorage*
+CVMEMSTORAGE(VALUE object)
+{
+  CvMemStorage *ptr;
+  Data_Get_Struct(object, CvMemStorage, ptr);
+  return ptr;
+}
+
+inline VALUE
+CHECK_CVMEMSTORAGE(VALUE object)
+{
+  if (rb_obj_is_kind_of(object, cCvMemStorage::rb_class()))
+    return object;
+  else {
+    if (!NIL_P(object))
+      rb_warn("invalid CvMemStorage object given. allocate new memory storage automatically.");
+    return cCvMemStorage::new_object();
+  }
+}
+
+__NAMESPACE_END_OPENCV
+
+#endif // RUBY_OPENCV_CVMEMSTORAGE_H