objectdetect 0.0.2 → 0.0.3

data/ext/objectdetect.c

@@ -9,13 +9,18 @@
 
 /*
 call-seq:
-  ObjectDetect::detect(model_path, target_path) -> [[x,y,width,height]]
+  ObjectDetect::detect(model_path, target_path, rescale_size=nil) -> [[x,y,width,height]]
 
 Detects objects in the image file +target_path+.
 +model_path+ needs to point a model file (e.g. /usr/local/share/opencv/haarcascades/haarcascade_frontalface_alt2.xml).
+If +rescale_size+ is specified and the width or height of the image is larger than +rescale_size+,
+the image is rescaled to fit into the size before processing.
  */
-static VALUE rb_detect(VALUE self, VALUE model_path, VALUE target_path) 
+static VALUE rb_detect(int argc, VALUE *argv, VALUE self)
 {
+  VALUE model_path, target_path, rescale_size;
+  rb_scan_args(argc, argv, "21", &model_path, &target_path, &rescale_size);
+
   Check_Type(model_path, T_STRING);
   Check_Type(target_path, T_STRING);
 
@@ -27,7 +32,8 @@ static VALUE rb_detect(VALUE self, VALUE model_path, VALUE target_path)
 
   /* load the target picture */
   IplImage *img = cvLoadImage(RSTRING(target_path)->ptr, 1);
-  if( img == 0 ) {
+  if( !img ) {
+    cvReleaseHaarClassifierCascade(&cascade);
     rb_raise(rb_eArgError, "Can't load the image file");
   }
 
@@ -37,13 +43,16 @@ static VALUE rb_detect(VALUE self, VALUE model_path, VALUE target_path)
   cvEqualizeHist(gray, gray);
 
   /* rescale */
-  int width_limit = 320, height_limit = 320;
-  double scale_w, scale_h, scale;
-  scale_w = (double)img->width/width_limit;
-  scale_h = (double)img->height/height_limit;
-  scale = (scale_w>scale_h) ? scale_w : scale_h;
-  if(scale < 1)
-    scale = 1;
+  double scale = 1;
+  if(argc == 3 || rescale_size != Qnil) {
+    double limit = (double)NUM2INT(rescale_size);
+    double scale_w, scale_h;
+    scale_w = (double)img->width/limit;
+    scale_h = (double)img->height/limit;
+    scale = (scale_w>scale_h) ? scale_w : scale_h;
+    if(scale < 1)
+      scale = 1;
+  }
   IplImage* small_img = cvCreateImage( cvSize( cvRound (img->width/scale),
 					       cvRound (img->height/scale)),
 				       8, 1 );
@@ -81,5 +90,5 @@ void Init_objectdetect()
 {
   VALUE module;
   module = rb_define_module("ObjectDetect");
-  rb_define_module_function(module, "detect", rb_detect, 2);
+  rb_define_module_function(module, "detect", rb_detect, -1);
 }

data/lib/objectdetect/version.rb

@@ -2,7 +2,7 @@ module Objectdetect #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 0
-    TINY  = 2
+    TINY  = 3
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.1
 specification_version: 1
 name: objectdetect
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
-date: 2007-03-14 00:00:00 +09:00
+  version: 0.0.3
+date: 2007-03-16 00:00:00 +09:00
 summary: A simple library for detecting objects in pictures.
 require_paths: 
 - lib