qrscanner 0.3.1 → 0.4

data/CHANGELOG

@@ -1,3 +1,4 @@
+v0.4. Better handling of scanned documents with multiple passes
 
 v0.3.1. Released for rubygems
 

data/ext/qrscanner/qrscanner.c

@@ -4,7 +4,7 @@
 
 #include "ruby.h"
 
-char *decode_qr_image(const char *fname);
+char *decode_qr_image(const char *fname, int dpi, int blur);
 
 VALUE QrScanner = Qnil;
 
@@ -19,8 +19,16 @@ void Init_qrscanner() {
 
 VALUE method_decode(VALUE self, VALUE fn) {
 	VALUE ret;
-	char *str;
-	str = decode_qr_image(StringValuePtr(fn));
+	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;
 		

data/ext/qrscanner/zxing/core/src/zxing/MultiFormatReader.cpp

@@ -93,7 +93,7 @@ namespace zxing {
         // continue
       }
     }
-    throw ReaderException("No code detected");
+    throw ReaderException("");
   }
   
   MultiFormatReader::~MultiFormatReader() {

data/ext/qrscanner/zxing/magick/src/qrscanner.cpp

@@ -18,6 +18,7 @@
  */
 
 #include <iostream>
+#include <cstdio>
 #include <fstream>
 #include <string>
 #include <Magick++.h>
@@ -58,7 +59,7 @@ Ref<Result> decode(Ref<BinaryBitmap> image, DecodeHints hints) {
 }
 
 
-extern "C" char *decode_qr_image(const char *fname) {
+extern "C" char *decode_qr_image(const char *fname, int dpi, int blur) {
 
   string cell_result;
   int res = -1;
@@ -66,19 +67,23 @@ extern "C" char *decode_qr_image(const char *fname) {
   Ref<BitMatrix> matrix(NULL);
   Ref<Binarizer> binarizer(NULL);
   const char* result_format = "";
-
-    Image image;
-    image.density(Geometry(300,300));  // for PDFs or vector input with low, incorrect DPI set eg. some Canon scanners
-    try {
-      image.read(fname);
-      image.blur(2, 0.5);
-    } catch (exception& e) {
-      cerr << "exception: ";
-      cerr << string(e.what()) << endl; 
-    } catch (...) {
-      cerr << "Unable to open image" << endl;
-      return(NULL);
+  
+  Image image;
+  if(dpi) {
+    image.density(Geometry(dpi,dpi));
+  }
+  try {
+    image.read(fname);
+    if(blur) {
+      image.blur(2, ((double)blur)/10.0);
     }
+  } catch (exception& e) {
+    cerr << "exception: ";
+    cerr << string(e.what()) << endl; 
+  } catch (...) {
+    cerr << "Unable to open image" << endl;
+    return(NULL);
+  }
 
 
   try {
@@ -95,8 +100,12 @@ extern "C" char *decode_qr_image(const char *fname) {
     result_format = barcodeFormatNames[result->getBarcodeFormat()];
     res = 0;
   } catch (ReaderException e) {
-    cell_result = "zxing::ReaderException: " + string(e.what());
-    res = -2;
+    if(strlen(e.what())==0) {
+      cell_result = "";
+    } else {
+      cell_result = "zxing::ReaderException: " + string(e.what());
+      res = -2;
+    }
   } catch (zxing::IllegalArgumentException& e) {
     cell_result = "zxing::IllegalArgumentException: " + string(e.what());
     res = -3;
@@ -109,7 +118,8 @@ extern "C" char *decode_qr_image(const char *fname) {
   }
 
   if(res<0) {
-    cerr << cell_result << endl;
+    if(cell_result.length() > 0)
+      cerr << cell_result << endl;
     return(NULL);
   }
 

data/qrscanner.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{qrscanner}
-  s.version = "0.3.1"
+  s.version = "0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andrew Snow"]
-  s.date = %q{2011-04-28}
+  s.date = %q{2011-07-27}
   s.default_executable = %q{qrscanner}
   s.description = %q{Ruby gem QR code scanner based on ZXing}
   s.email = %q{andrew@modulus.org}
@@ -18,10 +18,11 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Qrscanner", "--main", "README"]
   s.require_paths = ["lib", "ext"]
   s.rubyforge_project = %q{qrscanner}
-  s.rubygems_version = %q{1.6.2}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Ruby gem QR code scanner based on ZXing}
 
   if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

metadata

@@ -1,8 +1,11 @@
 --- !ruby/object:Gem::Specification 
 name: qrscanner
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.3.1
+  prerelease: false
+  segments: 
+  - 0
+  - 4
+  version: "0.4"
 platform: ruby
 authors: 
 - Andrew Snow
@@ -10,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-28 00:00:00 +10:00
+date: 2011-07-27 00:00:00 +10:00
 default_executable: 
 dependencies: []
 
@@ -997,17 +1000,22 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 1
+      - 2
       version: "1.2"
 requirements: []
 
 rubyforge_project: qrscanner
-rubygems_version: 1.6.2
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Ruby gem QR code scanner based on ZXing