findaface 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a9933fdbcf06f0b992964f5b45656ab1023e484
-  data.tar.gz: c97d9dd08c823a020b9d978dedbe4531740e0fd5
+  metadata.gz: 078e59a9d21bbb4aa72fc81bee801b69019bda64
+  data.tar.gz: 54ed12825955454be42fb02732374bd57f623edb
 SHA512:
-  metadata.gz: cee519454f51e091cefc4400cf1f97483a57a8f96fcdfc76c1b7e5421c66ce28aab9c593809078cca126a47d038641dd2a1ac027d28e2a4133c430fa6777c3f9
-  data.tar.gz: 376166d82e91e85b0fede00c78c5184d6f1d7774710b79c67c386adc180326b78a75a88a719d6ade2ca281fd76f5a4c0d39530857cef757367e96d72fad0f103
+  metadata.gz: bf0b6163665258ddd0da8c272075f8893d0ce4f0479c788ae885ab18550c4fb47df67aae52abc0048417b946c27027957de921dd43a7a3ab56e64b7feeded4cf
+  data.tar.gz: 49220350b083ec128c7e813e4a9d0be6fae629a6839792acc9c76f9ffb5948a27b0625cd6e264b922af73caa752dc8818cef8924a89899fe0f7c451e2f0d9140

data/README.md

@@ -70,6 +70,7 @@ Findaface.add_cascade(
     fussyness:7,
     scale_factor: 1.05,
     min_size: 100,
+    max_size: 512,
 	}
 )
 ```
@@ -80,6 +81,7 @@ Findaface.add_cascade(
 Basically the scale factor is used to create your scale pyramid. More explanation can be found
 [here](https://sites.google.com/site/5kk73gpu2012/assignment/viola-jones-face-detection#TOC-Image-Pyramid).
 * min_size: In pixels. Objects smaller than this size squared are ignored.
+* max_size: Objects bigger than this are ignored.
 
 ### Using multiple cascades
 If you add multiple cascades then they will be applied in turn. If any of the cascades matche, 
@@ -91,6 +93,7 @@ Findaface.add_cascade(
     fussyness:6,
     scale_factor: 1.05,
     min_size: 100,
+    max_size: 512,
 	}
 )
 Findaface.add_cascade(
@@ -99,6 +102,7 @@ Findaface.add_cascade(
     fussyness:6,
     scale_factor: 1.05,
     min_size: 100,
+    max_size: 512,
   }
 )
 

data/ext/findaface/findaface.cc

@@ -9,7 +9,7 @@
 
 using namespace cv;
 
-#define USAGE "USAGE: findaface --cascade=PATH.xml [--fussyness=integer] [--scale_factor=1.05] [--min_size=pixels] [ --resize=SCALE ] IMAGE"
+#define USAGE "USAGE: findaface --cascade=PATH.xml [--fussyness=integer] [--scale_factor=1.05] [--min_size=pixels] [--max-size=pixels] [ --resize=SCALE ] IMAGE"
 
 int main(int argc, const char** argv)
 {
@@ -24,6 +24,8 @@ int main(int argc, const char** argv)
   std::string scale_factor;
   // The minimum size (in pixels) of a detected feature. High values speed up detection
   std::string min_size;
+  // The maximum size (in pixels) of a detected feature.
+  std::string max_size;
   // Path to image
   std::string input_name;
 
@@ -31,6 +33,7 @@ int main(int argc, const char** argv)
   double scale_factor_number = 1.05;
   double resize_number = 1;
   int min_size_number = 80;
+  int max_size_number = 2048;
 
   CascadeClassifier cascade;
 
@@ -39,6 +42,7 @@ int main(int argc, const char** argv)
   const std::string fussyness_opt = "--fussyness=";
   const std::string scale_factor_opt = "--scale_factor=";
   const std::string min_size_opt = "--min_size=";
+  const std::string max_size_opt = "--max_size=";
   const std::string cascade_opt = "--cascade=";
 
   for (int i = 1; i < argc; i++) {
@@ -57,6 +61,9 @@ int main(int argc, const char** argv)
     } else if (min_size_opt.compare(0, min_size_opt.length(), argv[i], min_size_opt.length()) == 0) {
       min_size.assign(argv[i] + min_size_opt.length());
       min_size_number = atoi(min_size.c_str());
+    } else if (max_size_opt.compare(0, max_size_opt.length(), argv[i], max_size_opt.length()) == 0) {
+      max_size.assign(argv[i] + max_size_opt.length());
+      max_size_number = atoi(max_size.c_str());
     } else if (help_opt == argv[i]) {
       std::cout << USAGE << std::endl;
       return 0;
@@ -90,6 +97,11 @@ int main(int argc, const char** argv)
     return -1;
   }
 
+  if (max_size_number < 0 || max_size_number <= min_size_number) {
+    std::cerr << "ERROR: max_size must be positive integer bigger than min_size" << std::endl;
+    return -1;
+  }
+
   if (scale_factor_number <= 1 || scale_factor_number >= 1.5) {
     std::cerr << "ERROR: scale_factor should be around 1.05 (5%)" << std::endl;
     return -1;
@@ -110,7 +122,8 @@ int main(int argc, const char** argv)
 
     std::vector<Rect> faces;
 
-    cascade.detectMultiScale(small_image, faces, scale_factor_number, fussyness_number, 0, Size(min_size_number, min_size_number));
+    cascade.detectMultiScale(small_image, faces, scale_factor_number, fussyness_number, 0,
+				Size(min_size_number, min_size_number), Size(max_size_number, max_size_number));
 
     std::cout << faces.size() << "\tface(s) found\n";
     if(faces.size() >= 1) {

data/lib/findaface.rb

@@ -7,6 +7,7 @@ module Findaface
   DEFAULT_CASCADE = {
 			cascade:'haarcascades/haarcascade_frontalface_alt2.xml',
 			fussyness:4,
+			max_size: 512,
 			min_size: 80,
 			scale_factor: 1.05,
 	}
@@ -38,6 +39,7 @@ module Findaface
 		  "--fussyness=#{options[:fussyness]} " +
 		  "--scale_factor=#{options[:scale_factor]} " +
 		  "--min_size=#{options[:min_size]} " +
+		  "--max_size=#{options[:max_size]} " +
 			"#{path} > /dev/null 2>&1"
 	end
 

data/lib/findaface/version.rb

@@ -1,3 +1,3 @@
 module Findaface
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: findaface
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Andrew Nagi