rqrencoder 0.1.0 → 0.1.1

data/.gitignore

@@ -2,5 +2,6 @@ pkg/*
 *.gem
 .bundle
 *.swp
-lib/rqrencoder/CQREncoder.bundle
+lib/rqrencoder/RQREncoder.bundle
+Gemfile.lock
 tmp/*

data/Gemfile

@@ -1,4 +1,3 @@
 source "http://rubygems.org"
-
 # Specify your gem's dependencies in rqrencoder.gemspec
 gemspec

data/Rakefile

@@ -5,3 +5,11 @@ require 'rake/extensiontask'
 Rake::ExtensionTask.new("RQREncoder") do |extension|
   extension.lib_dir = "lib/rqrencoder"
 end
+
+desc "clean and compile"
+task :recompile => [:clean, :swig, :compile]
+
+desc "remake swig wrapper"
+task :swig do
+	`swig -ruby ext/rqrencoder/RQREncoder.i`
+end

data/ext/rqrencoder/RQREncoder.i

@@ -1,24 +1,25 @@
-%module RQREncoder
+%module "RQREncoder"
 %{
-#include "win2ansi.h"
-#include "QR_Encode.h"
+#include <qrencode.h>
 %}
-%include win2ansi.h
-%include QR_Encode.h
+%include qrencode.h
 
-%extend CQR_Encode {
-VALUE results()
-{
-  VALUE result = rb_ary_new2($self->m_nSymbleSize);
-  size_t ii = 0;
-  for (; ii < (size_t)$self->m_nSymbleSize; ++ii) {
-    VALUE innerAry = rb_ary_new2($self->m_nSymbleSize);
-    rb_ary_push(result, innerAry);
-    size_t jj = 0;
-    for (; jj < (size_t)$self->m_nSymbleSize; ++jj) {
-     rb_ary_push(innerAry, $self->m_byModuleData[ii][jj] ? Qtrue : Qfalse);
+%extend QRcode {
+  VALUE modules() {
+    VALUE result, row;
+    unsigned char *p;
+    int x, y, bit;
+    result = rb_ary_new2($self->width);
+    p = $self->data;
+    for(y=0; y < $self->width; y++) {
+      row = rb_ary_new2($self->width);
+      for(x=0; x < $self->width; x++) {
+        bit = *p & 1;
+        rb_ary_push(row, bit == 0 ? Qfalse : Qtrue);
+        p++;
+      }
+      rb_ary_push(result, row);
     }
+    return result;
   }
-  return result;
-}
-}
+}