opencv 0.0.6 → 0.0.7

data/Rakefile

@@ -28,7 +28,7 @@ EOF
   
   p.url = 'http://blueruby.mydns.jp/opencv'
   
-  p.extra_deps << ['hoe']
+  # p.extra_deps << 
 end
 
 # vim: syntax=Ruby

data/ext/cvchain.cpp

@@ -21,7 +21,8 @@ __NAMESPACE_BEGIN_CVCHAIN
 #define APPROX_CHAIN_METHOD(op) CVMETHOD("APPROX_CHAIN_METHOD", rb_hash_aref(op, ID2SYM(rb_intern("method"))), CV_CHAIN_APPROX_SIMPLE)
 #define APPROX_CHAIN_PARAMETER(op) NUM2INT(rb_hash_aref(op, ID2SYM(rb_intern("parameter"))))
 #define APPROX_CHAIN_MINIMAL_PARAMETER(op) NUM2INT(rb_hash_aref(op, ID2SYM(rb_intern("minimal_parameter"))))
-#define APPROX_CHAIN_RECURSIVE(op) ({VALUE _recursive = rb_hash_aref(op, ID2SYM(rb_intern("recursive"))); NIL_P(_recursive) ? 0 : _recursive == Qfalse ? 0 : 1;})
+#define APPROX_CHAIN_RECURSIVE(op) RTEST(rb_hash_aref(op, ID2SYM(rb_intern("recursive")))) ? 0 : 1
+//#define APPROX_CHAIN_RECURSIVE(op) ({VALUE _recursive = rb_hash_aref(op, ID2SYM(rb_intern("recursive"))); NIL_P(_recursive) ? 0 : _recursive == Qfalse ? 0 : 1;})
 
 VALUE rb_klass;
 
@@ -158,17 +159,13 @@ rb_approx_chain(int argc, VALUE *argv, VALUE self)
   VALUE approx_chain_option, storage;
   rb_scan_args(argc, argv, "01", &approx_chain_option);
   approx_chain_option = APPROX_CHAIN_OPTION(approx_chain_option);
-  /* can't compile VC
   storage = cCvMemStorage::new_object();
   CvSeq *seq = cvApproxChains(CVSEQ(self), CVMEMSTORAGE(storage),			      
 			      APPROX_CHAIN_METHOD(approx_chain_option),
 			      APPROX_CHAIN_PARAMETER(approx_chain_option),			    
 			      APPROX_CHAIN_MINIMAL_PARAMETER(approx_chain_option),			      
-			      APPROX_CHAIN_RECURSIVE(approx_chain_option));
-  
+			      APPROX_CHAIN_RECURSIVE(approx_chain_option));  
   return cCvSeq::new_sequence(cCvContour::rb_class(), seq, cCvPoint::rb_class(), storage);
-  */
-  return Qnil;
 }
 
 VALUE

data/ext/cvhaarclassifiercascade.cpp

@@ -78,7 +78,7 @@ rb_load(VALUE klass, VALUE path)
 VALUE
 rb_save(VALUE self, VALUE path)
 {
-  rb_raise(rb_eNotImpError, "");
+  rb_raise(rb_eNotImpError, "not yet.");
 }
 
 /*

data/ext/cvhistogram.cpp

@@ -38,10 +38,16 @@ define_ruby_class()
   
   rb_klass = rb_define_class_under(opencv, "CvHistogram", rb_cObject);
   
+  //rb_define_private_method(rb_klass, "initialize", RUBY_METHOD_FUNC(rb_initialize), -1);
+
   rb_define_method(rb_klass, "is_uniform?", RUBY_METHOD_FUNC(rb_is_uniform), 0);
   rb_define_method(rb_klass, "is_sparse?", RUBY_METHOD_FUNC(rb_is_sparse), 0);
   rb_define_method(rb_klass, "has_range?", RUBY_METHOD_FUNC(rb_has_range), 0);
   rb_define_method(rb_klass, "dims", RUBY_METHOD_FUNC(rb_dims), 0);
+  
+  rb_define_method(rb_klass, "copy", RUBY_METHOD_FUNC(rb_copy), 0);
+  rb_define_method(rb_klass, "clear", RUBY_METHOD_FUNC(rb_clear), 0);
+  rb_define_method(rb_klass, "clear!", RUBY_METHOD_FUNC(rb_clear_bang), 0);
 
   rb_define_method(rb_klass, "normalize", RUBY_METHOD_FUNC(rb_normalize), 1);
   rb_define_method(rb_klass, "normalize!", RUBY_METHOD_FUNC(rb_normalize_bang), 1);
@@ -54,9 +60,15 @@ define_ruby_class()
 VALUE
 rb_allocate(VALUE klass)
 {
-  // not yet
-  return Qnil;
+  //return OPENCV_OBJECT(klass, 0);
+}
+
+/*
+VALUE
+rb_initialize(int argc, VALUE argv, VALUE self)
+{
 }
+*/
 
 /*
  * call-seq:
@@ -132,6 +144,19 @@ rb_copy(VALUE self)
   return dest;
 }
 
+/*
+ * call-seq:
+ *   clear
+ *
+ * Return histogram that sets all histogram bins to 0 in case of dense histogram and removes all histogram bins in case of sparse array.
+ */
+VALUE
+rb_clear(VALUE self)
+{
+  cvClearHist(CVHISTOGRAM(rb_copy(self)));
+  return self;
+}
+
 /*
  * call-seq:
  *   clear!

data/ext/cvhistogram.h

@@ -22,12 +22,15 @@ VALUE rb_class();
 
 void define_ruby_class();
 
+VALUE rb_initialize(int argc, VALUE *argv, VALUE self);
+
 VALUE rb_is_uniform(VALUE self);
 VALUE rb_is_sparse(VALUE self);
 VALUE rb_has_range(VALUE self);
 VALUE rb_dims(VALUE self);
 VALUE rb_bins(VALUE self);
 
+VALUE rb_copy(VALUE self);
 VALUE rb_clear(VALUE self);
 VALUE rb_clear_bang(VALUE self);
 

data/ext/cvmat.cpp

@@ -53,9 +53,10 @@ __NAMESPACE_BEGIN_CVMAT
 #define DRAWING_OPTION(op) NIL_P(op) ? rb_const_get(rb_class(), rb_intern("DRAWING_OPTION")) : rb_funcall(rb_const_get(rb_class(), rb_intern("DRAWING_OPTION")), rb_intern("merge"), 1, op)
 #define DO_COLOR(op) VALUE_TO_CVSCALAR(rb_hash_aref(op, ID2SYM(rb_intern("color"))))
 #define DO_THICKNESS(op) FIX2INT(rb_hash_aref(op, ID2SYM(rb_intern("thickness"))))
-#define DO_LINE_TYPE(op) FIX2INT(rb_hash_aref(op, ID2SYM(rb_intern("line_type"))) == ID2SYM("aa") ? INT2FIX(CV_AA) : rb_hash_aref(op, ID2SYM(rb_intern("line_type"))))
+#define DO_LINE_TYPE(op) FIX2INT(rb_equal(rb_hash_aref(op, ID2SYM(rb_intern("line_type"))), ID2SYM(rb_intern("aa"))) ? INT2FIX(CV_AA) : rb_hash_aref(op, ID2SYM(rb_intern("line_type"))))
 #define DO_SHIFT(op) FIX2INT(rb_hash_aref(op, ID2SYM(rb_intern("shift"))))
-#define DO_IS_CLOSED(op) ({VALUE _is_closed = rb_hash_aref(op, ID2SYM(rb_intern("is_closed"))); NIL_P(_is_closed) ? 0 : _is_closed == Qfalse ? 0 : 1;})
+#define DO_IS_CLOSED(op) RTEST(rb_hash_aref(op, ID2SYM(rb_intern("is_closed")))) ? 0 : 1
+//#define DO_IS_CLOSED(op) ({VALUE _is_closed = rb_hash_aref(op, ID2SYM(rb_intern("is_closed"))); RTEST(_is_closed) ? 0 : 1;})
 
 #define GOOD_FEATURES_TO_TRACK_OPTION(op) NIL_P(op) ? rb_const_get(rb_class(), rb_intern("GOOD_FEATURES_TO_TRACK_OPTION")) : rb_funcall(rb_const_get(rb_class(), rb_intern("GOOD_FEATURES_TO_TRACK_OPTION")), rb_intern("merge"), 1, op)
 #define GF_MAX(op) FIX2INT(rb_hash_aref(op, ID2SYM(rb_intern("max"))))
@@ -153,8 +154,8 @@ void define_ruby_class()
   rb_hash_aset(find_fundamental_matrix_option, ID2SYM(rb_intern("with_status")), Qfalse);
   rb_hash_aset(find_fundamental_matrix_option, ID2SYM(rb_intern("maximum_distance")), rb_float_new(1.0));
   rb_hash_aset(find_fundamental_matrix_option, ID2SYM(rb_intern("desirable_level")), rb_float_new(0.99));
-
-  rb_define_method(rb_klass, "initialize", RUBY_METHOD_FUNC(rb_initialize), -1);
+  
+  rb_define_private_method(rb_klass, "initialize", RUBY_METHOD_FUNC(rb_initialize), -1);
   // Ruby/OpenCV original functions
   rb_define_method(rb_klass, "method_missing", RUBY_METHOD_FUNC(rb_method_missing), -1);
   rb_define_method(rb_klass, "to_s", RUBY_METHOD_FUNC(rb_to_s), 0);
@@ -328,7 +329,7 @@ void define_ruby_class()
   //rb_define_method(rb_klass, "get_perspective_transform", RUBY_METHOD_FUNC(rb_get_perspective_transform), -1);
   //rb_define_alias(rb_klass, "warp_perspective_q_matrix", "get_perspective_transform");
   rb_define_method(rb_klass, "remap", RUBY_METHOD_FUNC(rb_remap), -1);
-  //rb_define_method(rb_klass, "log_polar", RUBY_METHOD_FUNC(rb_log_polar), -1);
+  rb_define_method(rb_klass, "log_polar", RUBY_METHOD_FUNC(rb_log_polar), -1);
   
   rb_define_method(rb_klass, "erode", RUBY_METHOD_FUNC(rb_erode), -1);
   rb_define_method(rb_klass, "erode!", RUBY_METHOD_FUNC(rb_erode_bang), -1);
@@ -452,7 +453,7 @@ rb_method_missing(int argc, VALUE *argv, VALUE self)
   VALUE name, args, method;
   rb_scan_args(argc, argv, "1*", &name, &args);
   method = rb_funcall(name, rb_intern("to_s"), 0);
-  if (RARRAY(args)->len != 0 || !rb_respond_to(rb_module_opencv(), rb_intern(StringValuePtr(method))))
+  if (RARRAY_LEN(args) != 0 || !rb_respond_to(rb_module_opencv(), rb_intern(StringValuePtr(method))))
     return rb_call_super(argc, argv);
   return rb_funcall(rb_module_opencv(), rb_intern(StringValuePtr(method)), 1, self);
 }
@@ -699,7 +700,7 @@ rb_copy(int argc, VALUE *argv, VALUE self)
         return Qnil;
       }
     }else
-      rb_raise(rb_eArgError, "");
+      rb_raise(rb_eArgError, "invalid argument. give %s or Fixnum.", rb_class2name(rb_klass));
   }
 }
 
@@ -886,26 +887,26 @@ rb_sub_rect(VALUE self, VALUE args)
   CvRect area;
   CvPoint topleft;
   CvSize size;
-  switch(RARRAY(args)->len) {
+  switch(RARRAY_LEN(args)) {
   case 1:
-    area = VALUE_TO_CVRECT(RARRAY(args)->ptr[0]);
+    area = VALUE_TO_CVRECT(RARRAY_PTR(args)[0]);
     break;
   case 2:
-    topleft = VALUE_TO_CVPOINT(RARRAY(args)->ptr[0]);
-    size = VALUE_TO_CVSIZE(RARRAY(args)->ptr[1]);
+    topleft = VALUE_TO_CVPOINT(RARRAY_PTR(args)[0]);
+    size = VALUE_TO_CVSIZE(RARRAY_PTR(args)[1]);
     area.x = topleft.x;
     area.y = topleft.y;
     area.width = size.width;
     area.height = size.height;
     break;
   case 4:
-    area.x = NUM2INT(RARRAY(args)->ptr[0]);
-    area.y = NUM2INT(RARRAY(args)->ptr[1]);
-    area.width = NUM2INT(RARRAY(args)->ptr[2]);
-    area.height = NUM2INT(RARRAY(args)->ptr[3]);
+    area.x = NUM2INT(RARRAY_PTR(args)[0]);
+    area.y = NUM2INT(RARRAY_PTR(args)[1]);
+    area.width = NUM2INT(RARRAY_PTR(args)[2]);
+    area.height = NUM2INT(RARRAY_PTR(args)[3]);
     break;
   default:
-    rb_raise(rb_eArgError, "wrong number of arguments (%d of 1 or 2 or 4)", RARRAY(args)->len);
+    rb_raise(rb_eArgError, "wrong number of arguments (%ld of 1 or 2 or 4)", RARRAY_LEN(args));
   }
   return DEPEND_OBJECT(rb_klass,
                        cvGetSubRect(CVARR(self), CVALLOC(CvMat), area),
@@ -978,7 +979,7 @@ rb_slice_height(VALUE self, VALUE num)
 VALUE
 rb_row(VALUE self, VALUE args)
 {
-  int len = RARRAY(args)->len;
+  int len = RARRAY_LEN(args);
   if (len < 1) {rb_raise(rb_eArgError, "wrong number of argument.(more than 1)");}
   VALUE ary = rb_ary_new2(len);
   for (int i = 0; i < len; i++) {
@@ -990,7 +991,7 @@ rb_row(VALUE self, VALUE args)
       rb_ary_store(ary, i, DEPEND_OBJECT(rb_klass, cvGetRows(CVARR(self), CVALLOC(CvMat), slice.start_index, slice.end_index), self));
     }        
   }
-  return RARRAY(ary)->len > 1 ? ary : rb_ary_entry(ary, 0);
+  return RARRAY_LEN(ary) > 1 ? ary : rb_ary_entry(ary, 0);
 }
 
 /*
@@ -1004,7 +1005,7 @@ rb_row(VALUE self, VALUE args)
 VALUE
 rb_col(VALUE self, VALUE args)
 {
-  int len = RARRAY(args)->len;
+  int len = RARRAY_LEN(args);
   if (len < 1) {rb_raise(rb_eArgError, "wrong number of argument.(more than 1)");}
   VALUE ary = rb_ary_new2(len);
   for (int i = 0; i < len; i++) {
@@ -1016,7 +1017,7 @@ rb_col(VALUE self, VALUE args)
       rb_ary_store(ary, i, DEPEND_OBJECT(rb_klass, cvGetCols(CVARR(self), CVALLOC(CvMat), slice.start_index, slice.end_index), self));
     }        
   }
-  return RARRAY(ary)->len > 1 ? ary : rb_ary_entry(ary, 0);
+  return RARRAY_LEN(ary) > 1 ? ary : rb_ary_entry(ary, 0);
 }
 
 /*
@@ -1134,11 +1135,11 @@ VALUE
 rb_aref(VALUE self, VALUE args)
 {
   int index[CV_MAX_DIM];
-  for (int i = 0; i < RARRAY(args)->len; i++) {
+  for (int i = 0; i < RARRAY_LEN(args); i++) {
     index[i] = NUM2INT(rb_ary_entry(args, i));
   }
   CvScalar scalar = cvScalarAll(0);
-  switch(RARRAY(args)->len) {      
+  switch(RARRAY_LEN(args)) {      
   case 1:
     scalar = cvGet1D(CVARR(self), index[0]);
     break;
@@ -1166,10 +1167,10 @@ rb_aset(VALUE self, VALUE args)
 {
   CvScalar scalar = VALUE_TO_CVSCALAR(rb_ary_pop(args));
   int index[CV_MAX_DIM];
-  for (int i = 0; i < RARRAY(args)->len; i++) {
+  for (int i = 0; i < RARRAY_LEN(args); i++) {
     index[i] = NUM2INT(rb_ary_entry(args, i));
   }
-  switch(RARRAY(args)->len) {
+  switch(RARRAY_LEN(args)) {
   case 1:
     cvSet1D(CVARR(self), index[0], scalar);
     break;
@@ -1466,7 +1467,7 @@ VALUE
 rb_merge(VALUE klass, VALUE args)
 {
   VALUE object, dest;
-  int len = RARRAY(args)->len;
+  int len = RARRAY_LEN(args);
   if (!(len > 0) || len > CV_CN_MAX) {
     rb_raise(rb_eArgError, "wrong number of argument (%d for 1..4)", len);
   }
@@ -1914,7 +1915,7 @@ rb_ne(VALUE self, VALUE val)
 VALUE
 rb_in_range(VALUE self, VALUE min, VALUE max)
 {
-  VALUE dest = dest = new_object(cvGetSize(CVARR(self)), CV_8UC1), tmp;
+  VALUE dest = new_object(cvGetSize(CVARR(self)), CV_8UC1), tmp;
   if (rb_obj_is_kind_of(min, rb_klass) && rb_obj_is_kind_of(max, rb_klass)) {
     cvInRange(CVARR(self), CVARR(min), CVARR(max), CVARR(dest));
   }else if (rb_obj_is_kind_of(min, rb_klass)) {
@@ -1988,7 +1989,7 @@ rb_sum(VALUE self)
 VALUE
 rb_avg(int argc, VALUE *argv, VALUE self)
 {
-  VALUE mask, mean;
+  VALUE mask;
   rb_scan_args(argc, argv, "01", &mask);
   
   return cCvScalar::new_object(cvAvg(CVARR(self), MASK(mask)));
@@ -2282,7 +2283,7 @@ rb_solve(int argc, VALUE *argv, VALUE self)
 VALUE
 rb_svd(int argc, VALUE *argv, VALUE self)
 {
-  rb_raise(rb_eNotImpError, "");
+  rb_raise(rb_eNotImpError, "not yet");
   /*
     VALUE u = Qnil, v = Qnil;
     rb_scan_args(argc, argv, "02", &u, &v);
@@ -2303,7 +2304,7 @@ rb_svd(int argc, VALUE *argv, VALUE self)
 VALUE
 rb_svbksb(int argc, VALUE *argv, VALUE self)
 {
-  rb_raise(rb_eNotImpError, "");
+  rb_raise(rb_eNotImpError, "not yet");
 }
 
 /*
@@ -2358,7 +2359,7 @@ rb_eigenvv_bang(int argc, VALUE *argv, VALUE self)
 VALUE
 rb_calc_covar_matrix(int argc, VALUE *argv, VALUE self)
 {
-  rb_raise(rb_eNotImpError, "");
+  rb_raise(rb_eNotImpError, "not yet.");
 }
 
 /*
@@ -2370,7 +2371,7 @@ rb_calc_covar_matrix(int argc, VALUE *argv, VALUE self)
 VALUE
 rb_mahalonobis(int argc, VALUE *argv, VALUE self)
 {
-  rb_raise(rb_eNotImpError, "");
+  rb_raise(rb_eNotImpError, "not yet.");
 }
 
 
@@ -2732,7 +2733,7 @@ rb_fill_poly_bang(int argc, VALUE *argv, VALUE self)
   rb_scan_args(argc, argv, "11", &points, &drawing_option);
   drawing_option = DRAWING_OPTION(drawing_option);
   if (!POINT_SET_P(points))
-    rb_raise(rb_eTypeError, "argument 1(points) should be %s.", cCvSeq::rb_class());
+    rb_raise(rb_eTypeError, "argument 1(points) should be %s.", rb_class2name(cCvSeq::rb_class()));
   /* // todo : draw multi-sequence polygon
   CvSeq *seq = CVSEQ(points);
   int contours = 1;
@@ -2802,7 +2803,7 @@ rb_fill_convex_poly_bang(int argc, VALUE *argv, VALUE self)
   rb_scan_args(argc, argv, "11", &points, &drawing_option);
   drawing_option = DRAWING_OPTION(drawing_option);
   if (!POINT_SET_P(points))
-    rb_raise(rb_eTypeError, "argument 1(points) should be %s.", cCvSeq::rb_class());
+    rb_raise(rb_eTypeError, "argument 1(points) should be %s.", rb_class2name(cCvSeq::rb_class()));
   int np = CVSEQ(points)->total;
   VALUE tmp = cCvMat::new_object(1, np, CV_32SC2);
   CvPoint *p = (CvPoint*)cvCvtSeqToArray(CVSEQ(points), CVMAT(tmp)->data.ptr, CV_WHOLE_SEQ);
@@ -3315,23 +3316,50 @@ rb_remap(int argc, VALUE *argv, VALUE self)
 
 /*
  * call-seq:
- *   log_polar(<i>center, magnitude, </i>)
+ *   log_polar(<i>size, center, m[, flags...]]</i>)
  *
  * Remaps image to log-polar space.
+ * 
+ * size
+ *   Destination image size (log-polar space's size)
+ * center
+ *   The transformation center, where the output precision is maximal. 
+ * m
+ *   Magnitude scale parameter. See below.
+ * flags
+ *   Interpolation method and option. default is :linear, :fill_outliers
+ * 
+ * log_polar transforms source image using the following transformation:
+ * 
+ * Forward transformation (:inverse_map is not set):
+ *   dst(phi,rho)<-src(x,y)
+ * Inverse transformation (:inverse_map is set):
+ *   dest(x,y)<-src(phi,rho)
+ *   where rho = M*log(sqrt(x^2+y^2))
+ *         phi = atan(y/x)
+ *
+ * use log_polar example.
+ * note: The order of the flag given to the argument is not significant. 
+ *   lp1 = mat.log_polar(size, center, m, :linear, :fill_outliers)  #=> default
+ *   lp2 = mat.log_polar(size, center, m, :linear, :fill_outliers, :inverse_map) 
+ *   lp3 = mat.log_polar(size, center, m, :inverse_map, :linear, :fill_outliers) # same as lp2
+ *   lp4 = mat.log_polar(size, center, m, :cubic) # use other interpolation method
  */
 VALUE
 rb_log_polar(int argc, VALUE *argv, VALUE self)
 {
-  /*
-  VALUE size, center, m, flags, fillval, dest;
-  rb_scan_args(argc, argv, "3*", &size, &center, &m, &flags);
-  dest = cCvMat::new_object();
+  VALUE size, center, m, args, dest; //interpolation, warp, dest;
+  rb_scan_args(argc, argv, "3*", &size, &center, &m, &args);
+  dest = cCvMat::new_object(VALUE_TO_CVSIZE(size), cvGetElemType(CVARR(self)));
+  int flags = 0;
+  if(!RARRAY_LEN(args))
+    for(int i = 0; i < RARRAY_LEN(args); i++)
+      flags = flags | CVMETHOD("LOG_POLAR_METHOD", RARRAY_PTR(args)[i]);
+  else
+    flags = CV_INTER_LINEAR | CV_WARP_FILL_OUTLIERS;
   cvLogPolar(CVARR(self), CVARR(dest),
-	     VALUE_TO_CVPOINT2D32F(center), NUM2DBL(m),
-	     CVMETHOD("INTERPOLATION_METHOD", interpolation, CV_INTER_LINEAR) | CVMETHOD("WARP_FLAG", option, CV_WARP_FILL_OUTLIEARS), VALUE_TO_CVSCALAR(fillval));
+	     VALUE_TO_CVPOINT2D32F(center), NUM2DBL(m), flags);
   return dest;
-  */
-  return Qnil;
 }
 
 /*
@@ -3555,7 +3583,7 @@ rb_smooth_gaussian(int argc, VALUE *argv, VALUE self)
 {
   SUPPORT_C1C3_ONLY(self);
   VALUE p1, p2, p3, p4, dest;
-  rb_scan_args(argc, argv, "04", &p1, &p2, &p3, p4);
+  rb_scan_args(argc, argv, "04", &p1, &p2, &p3, &p4);
   dest = cCvMat::new_object(cvGetSize(CVARR(self)), cvGetElemType(CVARR(self)));
   cvSmooth(CVARR(self), CVARR(dest), CV_GAUSSIAN, IF_INT(p1, 3), IF_INT(p2, 0), IF_DBL(p3, 0.0), IF_DBL(p4, 0.0));
   return dest;
@@ -3615,7 +3643,6 @@ rb_filter2d(int argc, VALUE *argv, VALUE self)
   rb_scan_args(argc, argv, "11", &kernel, &anchor);
   if (!rb_obj_is_kind_of(kernel, cCvMat::rb_class()))
     rb_raise(rb_eTypeError, "argument 1 (kernel) should be %s.", rb_class2name(cCvMat::rb_class()));
-  int type = cvGetElemType(CVARR(kernel));
   dest = cCvMat::new_object(cvGetSize(CVARR(self)), cvGetElemType(CVARR(self)));
   cvFilter2D(CVARR(self), CVARR(dest), CVMAT(kernel), NIL_P(anchor) ? cvPoint(-1,-1) : VALUE_TO_CVPOINT(anchor));
   return dest;
@@ -4338,11 +4365,11 @@ rb_match_template(int argc, VALUE *argv, VALUE self)
     rb_raise(rb_eTypeError, "argument 1 (template) should be %s.", rb_class2name(cCvMat::rb_class()));
   if (cvGetElemType(CVARR(self)) != cvGetElemType(CVARR(templ)))
     rb_raise(rb_eTypeError, "template should be same type of self.");
-  CvSize src_size = cvGetSize(CVARR(self)), template_size = cvGetSize(CVARR(self));   
+  CvSize src_size = cvGetSize(CVARR(self)), template_size = cvGetSize(CVARR(templ));   
   result = cCvMat::new_object(cvSize(src_size.width - template_size.width + 1,
 				     src_size.height - template_size.height + 1),
 			      CV_32FC1);
-  cvMatchTemplate(CVARR(self), CVARR(templ), CVARR(result), CVMETHOD("MATCH_TEMPLATE_METHOD", CV_TM_SQDIFF));
+  cvMatchTemplate(CVARR(self), CVARR(templ), CVARR(result), CVMETHOD("MATCH_TEMPLATE_METHOD", method, CV_TM_SQDIFF));
   return result;
 }
 
@@ -4488,7 +4515,7 @@ rb_snake_image(int argc, VALUE *argv, VALUE self)
     c = ALLOC(float);
     c[0] = (float)NUM2DBL(gamma);
   }else{ // CV_ARRAY
-    rb_raise(rb_eNotImpError, "");
+    rb_raise(rb_eNotImpError, "not yet.");
     // todo
   }
   CvSize w = VALUE_TO_CVSIZE(window);

data/ext/cvmat.h

@@ -181,7 +181,7 @@ VALUE rb_rotation(VALUE self, VALUE center, VALUE angle, VALUE scale);
 VALUE rb_warp_perspective(int argc, VALUE *argv, VALUE self);
 //VALUE rb_perspective_transform();
 VALUE rb_remap(int argc, VALUE *argv, VALUE self);
-VALUE rb_log_polar(int argc, VALUE *argv);
+VALUE rb_log_polar(int argc, VALUE *argv, VALUE self);
 
 VALUE rb_erode(int argc, VALUE *argv, VALUE self);
 VALUE rb_erode_bang(int argc, VALUE *argv, VALUE self);

data/ext/cvseq.cpp

@@ -343,8 +343,8 @@ rb_push(VALUE self, VALUE args)
   CvSeq *seq = CVSEQ(self);
   VALUE klass = seqblock_class(seq), object;
   void *buffer = 0;      
-  for(int i = 0; i < RARRAY(args)->len; i++){
-    object = RARRAY(args)->ptr[i];
+  for(int i = 0; i < RARRAY_LEN(args); i++){
+    object = RARRAY_PTR(args)[i];
     if(CLASS_OF(object) == klass){
       cvSeqPush(seq, DATA_PTR(object));          
     }else if(rb_obj_is_kind_of(object, rb_klass) && CLASS_OF(object) == klass){ // object is CvSeq
@@ -403,8 +403,8 @@ rb_unshift(VALUE self, VALUE args)
   CvSeq *seq = CVSEQ(self);
   VALUE klass = seqblock_class(seq), object;
   void *buffer = 0;      
-  for(int i = 0; i < RARRAY(args)->len; i++){
-    object = RARRAY(args)->ptr[i];
+  for(int i = 0; i < RARRAY_LEN(args); i++){
+    object = RARRAY_PTR(args)[i];
     if(CLASS_OF(object) == klass){
       cvSeqPushFront(seq, DATA_PTR(object));
     }else if(rb_obj_is_kind_of(object, rb_klass) && CLASS_OF(object) == klass){

data/ext/cvtermcriteria.h

@@ -57,13 +57,13 @@ VALUE_TO_CVTERMCRITERIA(VALUE object)
   case T_FLOAT:
     return cvTermCriteria(CV_TERMCRIT_EPS, 0, NUM2DBL(object));
   case T_ARRAY:
-    if (RARRAY(object)->len == 2) {
+    if (RARRAY_LEN(object) == 2) {
       return cvTermCriteria(CV_TERMCRIT_ITER|CV_TERMCRIT_EPS,
                             NUM2INT(rb_ary_entry(object, 0)),
                             NUM2DBL(rb_ary_entry(object, 1)));
     }
   }
-  rb_raise(rb_eTypeError, "");
+  rb_raise(rb_eTypeError, "can't convert CvTermCriteria.");
 }
 
 __NAMESPACE_END_OPENCV

data/ext/cvvideowriter.cpp

@@ -60,17 +60,17 @@ rb_initialize(int argc, VALUE *argv, VALUE self)
   char codec[4] = {' ', ' ', ' ', ' '};
   int codec_number;
   Check_Type(filename, T_STRING);
-  if (RSTRING(filename)->len == 0)
+  if (RSTRING_LEN(filename) == 0)
     rb_raise(rb_eArgError, "argument 1 (file name) dose not given");
   if (NIL_P(fourcc))
     codec_number = -1;
   else {
     Check_Type(fourcc, T_STRING);
-    if (RSTRING(fourcc)->len > 4)
+    if (RSTRING_LEN(fourcc) > 4)
       rb_raise(rb_eStandardError, "argument 2 (fourcc) should be specific 4-character. (i.e \"PIM1\",\"MJPG\")");
     else {
-      for (int i = 0; i < RSTRING(fourcc)->len; i++)
-        codec[i] = RSTRING(fourcc)->ptr[i];
+      for (int i = 0; i < RSTRING_LEN(fourcc); i++)
+        codec[i] = RSTRING_PTR(fourcc)[i];
       codec_number = CV_FOURCC(codec[0], codec[1], codec[2], codec[3]);
     }
   }

data/ext/mouseevent.cpp

@@ -166,7 +166,7 @@ rb_alt_key_q(VALUE self)
 }
 
 VALUE
-new_object(int flag, int y, int x, int event)
+new_object(int event, int x, int y, int flag)
 {
   VALUE object = rb_allocate(rb_class());
   MouseEvent *mouseevent = MOUSEEVENT(object);

data/ext/opencv.cpp

@@ -248,6 +248,9 @@ define_ruby_module()
   RESIST_CVMETHOD(match_template_method, "ccoeff", CV_TM_CCOEFF);
   RESIST_CVMETHOD(match_template_method, "ccoeff_normed", CV_TM_CCOEFF_NORMED);
 
+  VALUE log_polar_method = rb_funcall(interpolation_method, rb_intern("merge"), 1, warp_flag);
+  rb_define_const(rb_module, "LOG_POLAR_METHOD", log_polar_method);
+
   /* color convert methods */
   rb_define_module_function(rb_module, "BGR2BGRA", RUBY_METHOD_FUNC(rb_BGR2BGRA), 1);
   rb_define_module_function(rb_module, "RGB2RGBA", RUBY_METHOD_FUNC(rb_RGB2RGBA), 1);

data/ext/opencv.h

@@ -15,12 +15,12 @@
 
 /* include headers */
 #include <ruby.h>
-#include <version.h>
 
 #ifdef RUBY_WIN32_H
 #ifdef write
 #undef write
 #endif // write
+#pragma warning(disable : 4819)
 #endif // RUBY_WIN32_H
 
 #ifndef ANYARGS
@@ -28,7 +28,12 @@
 #endif
 
 extern "C"{
-#include <st.h>
+#ifdef HAVE_RUBY_ST_H
+# include "ruby/st.h"
+#else
+# include "st.h"
+#endif
+
 #ifdef HAVE_CALLBACK_H
 #include <callback.h> // callhack.h is ffcall header
 #endif
@@ -203,7 +208,7 @@ CVMETHOD(const char *name, VALUE method, int ifnone = 0)
         return FIX2INT(value);
       }if (rb_obj_is_kind_of(value, rb_cNumeric))
   default:
-    rb_raise(rb_eTypeError, "");
+    rb_raise(rb_eTypeError, "undefined method.");
   }
   return 0;
 }
@@ -305,7 +310,7 @@ __NAMESPACE_END_OPENCV
 inline VALUE
 extract_options_from_args_bang(VALUE ary)
 {
-  return (RARRAY(ary)->len > 0 && rb_obj_is_kind_of(RARRAY(ary)->ptr[RARRAY(ary)->len -1], rb_cHash)) ? rb_ary_pop(ary) : rb_hash_new();
+  return (RARRAY_LEN(ary) > 0 && rb_obj_is_kind_of(RARRAY_PTR(ary)[RARRAY_LEN(ary) - 1], rb_cHash)) ? rb_ary_pop(ary) : rb_hash_new();
 }
 
 /*

data/ext/pointset.cpp

@@ -176,9 +176,9 @@ __NAMESPACE_END_POINT_SET
 int
 CVPOINTS_FROM_POINT_SET(VALUE object, CvPoint **pointset)
 {
-  VALUE storage;
-  CvSeq *seq = 0;
-  CvPoint2D32f p32;
+  //VALUE storage;
+  //CvSeq *seq = 0;
+  //CvPoint2D32f p32;
   if(rb_obj_is_kind_of(object, cCvSeq::rb_class())){
     if(CV_IS_SEQ_POINT_SET(CVSEQ(object))){ 
       *pointset = (CvPoint*)cvCvtSeqToArray(CVSEQ(object), cvAlloc(CVSEQ(object)->total * CVSEQ(object)->elem_size));
@@ -190,12 +190,12 @@ CVPOINTS_FROM_POINT_SET(VALUE object, CvPoint **pointset)
     /* to do */
     rb_raise(rb_eNotImpError, "CvMat to CvSeq conversion not implemented.");
   }else if(rb_obj_is_kind_of(object, rb_cArray)){
-    *pointset = (CvPoint*)cvAlloc(RARRAY(object)->len * sizeof(CvPoint));
-    for(int i = 0; i < RARRAY(object)->len; i++){
+    *pointset = (CvPoint*)cvAlloc(RARRAY_LEN(object) * sizeof(CvPoint));
+    for(int i = 0; i < RARRAY_LEN(object); i++){
       (*pointset)[i].x = NUM2INT(rb_funcall(rb_ary_entry(object, i), rb_intern("x"), 0));
       (*pointset)[i].y = NUM2INT(rb_funcall(rb_ary_entry(object, i), rb_intern("y"), 0));
     }
-    return RARRAY(object)->len;
+    return RARRAY_LEN(object);
   }else{
     rb_raise(rb_eTypeError, "Can't convert CvSeq(PointSet).");
   }  
@@ -220,10 +220,10 @@ VALUE_TO_POINT_SET(VALUE object)
     rb_raise(rb_eNotImpError, "CvMat to CvSeq conversion not implemented.");
   }else if(rb_obj_is_kind_of(object, rb_cArray)){
     //pointset = cCvSeq::new_sequence(cCvSeq::rb_class(), )
-    length = RARRAY(object)->len;
+    length = RARRAY_LEN(object);
     storage = cCvMemStorage::new_object();
     seq = cvCreateSeq(CV_SEQ_POINT_SET, sizeof(CvSeq), sizeof(CvPoint), CVMEMSTORAGE(storage));    
-    for(int i = 0; i < RARRAY(object)->len; i++){
+    for(int i = 0; i < RARRAY_LEN(object); i++){
       p32.x = NUM2DBL(rb_funcall(rb_ary_entry(object, i), rb_intern("x"), 0));
       p32.y = NUM2DBL(rb_funcall(rb_ary_entry(object, i), rb_intern("y"), 0));
       cvSeqPush(seq, &p32);

data/ext/trackbar.cpp

@@ -76,7 +76,7 @@ VALUE rb_initialize(int argc, VALUE *argv, VALUE self){
   if(NIL_P(block)){rb_raise(rb_eArgError, "block not given.");}
   Check_Type(name, T_STRING);
   Trackbar *trackbar = TRACKBAR(self);
-  trackbar->name = strcpy(ALLOC_N(char, RSTRING(name)->len), StringValueCStr(name));
+  trackbar->name = strcpy(ALLOC_N(char, RSTRING_LEN(name)), StringValueCStr(name));
   trackbar->maxval = NUM2INT(maxval);
   trackbar->val = IF_INT(val, 0);
   trackbar->block = block;

data/ext/window.cpp

@@ -29,7 +29,7 @@ GET_WINDOW_NAME(VALUE object)
 {
   void *handle = DATA_PTR(object);
   if (!handle)
-    rb_raise(rb_eStandardError, "window handle error"); 
+    rb_raise(rb_eStandardError, "window handle error");
   const char *window_name = cvGetWindowName(handle);
   return window_name;
 }
@@ -49,9 +49,9 @@ define_ruby_class()
 {
   if (rb_klass)
     return;
-  /* 
+  /*
    * opencv = rb_define_module("OpenCV");
-   * GUI = rb_define_module_under(opencv, "GUI");         
+   * GUI = rb_define_module_under(opencv, "GUI");
    *
    * note: this comment is used by rdoc.
    */
@@ -96,6 +96,8 @@ each_protect(VALUE key, VALUE value)
 void
 free(void *ptr)
 {
+  st_table *holder;
+  if (st_delete(windows, (st_data_t*)ptr, (st_data_t*)&holder)) { st_free_table(holder); }
   cvFree(&ptr);
 }
 
@@ -112,7 +114,7 @@ rb_aref(VALUE klass, VALUE name)
   Check_Type(name, T_STRING);
   void *handle = cvGetWindowHandle(StringValueCStr(name));
   st_table *holder;
-  if (st_lookup(windows, (st_data_t)handle, (st_data_t*)&holder) && 
+  if (st_lookup(windows, (st_data_t)handle, (st_data_t*)&holder) &&
       st_lookup(holder, 0, (st_data_t*)&window)) {
     return window;
   }
@@ -217,7 +219,7 @@ rb_resize(int argc, VALUE *argv, VALUE self)
     size = cvSize(FIX2INT(argv[0]), FIX2INT(argv[1]));
     break;
   default:
-    rb_raise(rb_eArgError, "wrong number of arguments (1 or 2)");          
+    rb_raise(rb_eArgError, "wrong number of arguments (1 or 2)");
   }
   cvResizeWindow(GET_WINDOW_NAME(self), size.width, size.height);
   return self;
@@ -242,12 +244,12 @@ rb_move(int argc, VALUE *argv, VALUE self)
     point = cvPoint(FIX2INT(argv[0]), FIX2INT(argv[1]));
     break;
   default:
-    rb_raise(rb_eArgError, "wrong number of arguments (1 or 2)");          
+    rb_raise(rb_eArgError, "wrong number of arguments (1 or 2)");
   }
   cvMoveWindow(GET_WINDOW_NAME(self), point.x, point.y);
   return self;
 }
-      
+
 /*
  * call-seq:
  *   show_image(<i>image</i>)
@@ -313,7 +315,7 @@ rb_set_trackbar(int argc, VALUE *argv, VALUE self)
  *   window = OpenCV::GUI::Window.new "sample window"
  *   image = OpenCV::IplImage::load "sample.png"
  *   window.show(image)
- *   window.set_mouse_callback{|mouse|  
+ *   window.set_mouse_callback{|mouse|
  *     e = "#{mouse.x}, #{mouse.y} : #{mouse.event} : "
  *     e << "<L>" if mouse.left_button?
  *     e << "<R>" if mouse.right_button?
@@ -325,18 +327,32 @@ rb_set_trackbar(int argc, VALUE *argv, VALUE self)
  *   }
  *   OpenCV::GUI::wait_key
  */
+/*
 VALUE
 rb_set_mouse_callback(VALUE self)
-{  
+{
   VALUE block = rb_block_given_p() ? rb_block_proc() : 0;
   if (!block) {rb_raise(rb_eArgError, "block not given.");}
-  void *callback = (void *)alloc_callback(&mouse_callback, block);  
-  cvSetMouseCallback(GET_WINDOW_NAME(self), (CvMouseCallback)callback);
+  void *callback = (void *)alloc_callback(&mouse_callback, block);
+  cvSetMouseCallback(GET_WINDOW_NAME(self), (CvMouseCallback)callback, 0);
   st_table *holder;
   if (st_lookup(windows, (st_data_t)DATA_PTR(self), (st_data_t*)&holder)) {
     st_insert(holder, rb_cProc, block);
   }else{
-    rb_raise(rb_eStandardError, "window is destroied.");
+    rb_raise(rb_eStandardError, "window is destroyed.");
+  }
+  return block;
+}
+*/
+VALUE
+rb_set_mouse_callback(VALUE self)
+{
+  VALUE block = rb_block_given_p() ? rb_block_proc() : 0;
+  if (!block) {rb_raise(rb_eArgError, "block not given.");}
+  cvSetMouseCallback(GET_WINDOW_NAME(self), on_mouse, (void*)block);
+  st_table *holder;
+  if (st_lookup(windows, (st_data_t)DATA_PTR(self), (st_data_t*)&holder)){
+	  st_insert(holder, self, block);
   }
   return block;
 }
@@ -349,20 +365,23 @@ trackbar_callback(VALUE block, va_alist ap)
   va_return_void(ap);
 }
 
+/*
 void
 mouse_callback(VALUE block, va_alist ap)
 {
   va_start_void(ap);
-  //VALUE ary = rb_ary_new2(4);
-  //for (int i = 0; i < 4; i++)
-  //  rb_ary_store(ary, i, INT2FIX(va_arg_int(ap)));
-  //rb_apply(block, rb_intern("call"), ary);
   rb_funcall(block, rb_intern("call"), 1, cMouseEvent::new_object(va_arg_int(ap),va_arg_int(ap),va_arg_int(ap),va_arg_int(ap)));
   va_return_void(ap);
 }
+*/
+
+void on_mouse( int event, int x, int y, int flags, void* param ) {
+  rb_funcall((VALUE)param, rb_intern("call"), 1, cMouseEvent::new_object(event, x, y, flags));
+}
 
 __NAMESPACE_END_WINDOW
 __NAMESPACE_END_GUI
 __NAMESPACE_END_OPENCV
 
+
 #endif // HAVE_CALLBACK_H

data/ext/window.h

@@ -45,7 +45,8 @@ VALUE rb_set_trackbar(int argc, VALUE *argv, VALUE self);
 VALUE rb_set_mouse_callback(VALUE self);
 
 void trackbar_callback(VALUE block, va_alist ap);
-void mouse_callback(VALUE block, va_alist ap);
+//void mouse_callback(VALUE block, va_alist ap);
+void on_mouse( int event, int x, int y, int flags, void* param );
 
 __NAMESPACE_END_WINDOW
 __NAMESPACE_END_GUI

data/lib/version.rb

@@ -1,3 +1,3 @@
 module OpenCV
-  VERSION = '0.0.6'
+  VERSION = '0.0.7'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: opencv
 version: !ruby/object:Gem::Version 
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors: 
 - Masakazu Yonekura
@@ -10,26 +10,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-06-29 00:00:00 +09:00
+date: 2009-03-29 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: hoe
+  type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: hoe
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.6.0
+        version: 1.11.0
     version: 
 description: OpenCV wrapper for Ruby
 email: 
@@ -183,7 +175,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: opencv
-rubygems_version: 1.0.1
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: OpenCV wrapper for Ruby.