qrscanner 0.4 → 0.4.1

data/CHANGELOG

@@ -1,3 +1,5 @@
+v0.4.1. Add additional passes for problematic scans
+
 v0.4. Better handling of scanned documents with multiple passes
 
 v0.3.1. Released for rubygems

data/ext/qrscanner/qrscanner.c

@@ -13,28 +13,32 @@ void Init_qrscanner();
 VALUE method_decode(VALUE self, VALUE fn);
 
 void Init_qrscanner() {
-	QrScanner = rb_define_module("QrScanner");
-	rb_define_singleton_method(QrScanner, "decode", method_decode, 1);
+  QrScanner = rb_define_module("QrScanner");
+  rb_define_singleton_method(QrScanner, "decode", method_decode, 1);
 }
 
 VALUE method_decode(VALUE self, VALUE fn) {
-	VALUE ret;
-	char *str = NULL;
-	int dpis[] = {0, 40, 50, 60, 70, 80, 90, 100, 110, 120, 130, 140, 150, 160, 170, 180, 190, 200, 220, 240, 260, 280, 300, 450};
-	int blurs[] = {0, 2, 4, 6, 8, 10, 15, 20, 50};
-	int dpi, blur;
-
-       	for(blur=0; !str && blur<9; blur++) {
-       	 	for(dpi=0; !str && dpi<11; dpi++) {
-       			str = decode_qr_image(StringValuePtr(fn), dpis[dpi], blurs[blur]);
-       		}
-               }
-	if(!str)
-		return Qnil;
+  VALUE ret;
+  char *str = NULL;
+  int dpis[] = {0, 40, 50, 60, 70, 75, 80, 85, 90, 95, 100, 105, 110, 115, 120, 125, 130, 135, 140, 145, 150, 155, 160, 165, 170, 175, 180, 185, 190, 195, 200, 210, 220, 230, 240, 250, 260, 280, 300, 450};
+  int blurs[] = {0, 2, 4, 6, 8, 10, 15, 20, 50};
+  int num_dpis, num_blurs, dpi, blur;
+
+  num_dpis = sizeof(dpis) / sizeof(*dpis);
+  num_blurs = sizeof(blurs) / sizeof(*blurs);
+    
+  for(blur=0; !str && blur<num_blurs; blur++) {
+    for(dpi=0; !str && dpi<num_dpis; dpi++) {
+      /*printf("dpi=%d, blur=%d\n", dpis[dpi], blurs[blur]);*/
+      str = decode_qr_image(StringValuePtr(fn), dpis[dpi], blurs[blur]);
+    }
+  }
+  if(!str)
+    return Qnil;
 		
-	ret = rb_str_new2(str);
-	free(str);
-	return(ret);
+  ret = rb_str_new2(str);
+  free(str);
+  return(ret);
 }
 
 //}

data/qrscanner.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{qrscanner}
-  s.version = "0.4"
+  s.version = "0.4.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andrew Snow"]
-  s.date = %q{2011-07-27}
+  s.date = %q{2011-09-14}
   s.default_executable = %q{qrscanner}
   s.description = %q{Ruby gem QR code scanner based on ZXing}
   s.email = %q{andrew@modulus.org}

metadata

@@ -5,7 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  version: "0.4"
+  - 1
+  version: 0.4.1
 platform: ruby
 authors: 
 - Andrew Snow
@@ -13,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-27 00:00:00 +10:00
+date: 2011-09-14 00:00:00 +10:00
 default_executable: 
 dependencies: []