Rdmtx 0.2.2 → 0.3.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 5e874121a53296bf28bd6af2c3010f1077145005
+  data.tar.gz: 691f2663d354cd6a350470df612a8dc90b18eedc
+SHA512:
+  metadata.gz: a6232a2b3881548515207fd8d4077ff7df5d7b3b0037a2b907170994fd591da348c1fecf1938a5b383c50b2737ab041b23a7a1552def288410215e241d1497ca
+  data.tar.gz: 39df386faaeb514c0dc777af1f15cbc0cf14bcf8853976b1458e6d237d9c94c876b9ed535110f51e1965815813b36ec6259a725b5a5ec6176ba13b2af7e15964

data/ext/rdmtx/Rdmtx.c

@@ -49,6 +49,7 @@ static VALUE rdmtx_decode(VALUE self, VALUE image /* Image from RMagick (Magick:
     DmtxDecode * decode = dmtxDecodeCreate(dmtxImage, 1);
 
     DmtxRegion * region;
+    DmtxMessage * message;
 
     int intTimeout = NUM2INT(timeout);
     DmtxTime dmtxTimeout = dmtxTimeAdd(dmtxTimeNow(), intTimeout);
@@ -63,7 +64,7 @@ static VALUE rdmtx_decode(VALUE self, VALUE image /* Image from RMagick (Magick:
         if (region == NULL )
             break;
 
-        DmtxMessage * message = dmtxDecodeMatrixRegion(decode, region, DmtxUndefined);
+        message = dmtxDecodeMatrixRegion(decode, region, DmtxUndefined);
         if (message != NULL) {
             VALUE outputString = rb_str_new2((char *)message->output);
             rb_ary_push(results, outputString);
@@ -79,17 +80,42 @@ static VALUE rdmtx_decode(VALUE self, VALUE image /* Image from RMagick (Magick:
     return results;
 }
 
-static VALUE rdmtx_encode(VALUE self, VALUE string, VALUE margin, VALUE module) {
+static VALUE rdmtx_encode(int argc, VALUE * argv, VALUE self) {
+
+    VALUE string, margin, module, size;
+    VALUE safeString;
+    int safeMargin, safeModule, safeSize;
+    DmtxEncode * enc;
+    int width;
+    int height;
+    VALUE magickImageClass;
+    VALUE outputImage;
+
+    rb_scan_args(argc, argv, "13", &string,
+                 &margin, &module, &size);
+
+    safeString = StringValue(string);
+    if(margin == Qnil) {
+        safeMargin = 5;
+    } else {
+        safeMargin = NUM2INT(margin);
+    }
+    if(module == Qnil) {
+        safeModule = 5;
+    } else {
+        safeMargin = NUM2INT(module);
+    }
+    if(size == Qnil) {
+        safeSize = DmtxSymbolSquareAuto;
+    } else {
+        safeSize = NUM2INT(size);
+    }
 
     /* Create and initialize libdmtx structures */
-    DmtxEncode * enc = dmtxEncodeCreate();
-
-    VALUE safeString = StringValue(string);
-    int safeMargin = NUM2INT(margin);
-    int safeModule = NUM2INT(module);
+    enc = dmtxEncodeCreate();
 
     dmtxEncodeSetProp(enc, DmtxPropPixelPacking, DmtxPack24bppRGB);
-    dmtxEncodeSetProp(enc, DmtxPropSizeRequest, DmtxSymbolSquareAuto);
+    dmtxEncodeSetProp(enc, DmtxPropSizeRequest, safeSize);
 
     dmtxEncodeSetProp(enc, DmtxPropMarginSize, safeMargin);
     dmtxEncodeSetProp(enc, DmtxPropModuleSize, safeModule);
@@ -102,11 +128,11 @@ static VALUE rdmtx_encode(VALUE self, VALUE string, VALUE margin, VALUE module)
         return Qnil;
     }
 
-    int width = dmtxImageGetProp(enc->image, DmtxPropWidth);
-    int height = dmtxImageGetProp(enc->image, DmtxPropHeight);
+    width = dmtxImageGetProp(enc->image, DmtxPropWidth);
+    height = dmtxImageGetProp(enc->image, DmtxPropHeight);
 
-    VALUE magickImageClass = rb_path2class("Magick::Image");
-    VALUE outputImage = rb_funcall(magickImageClass, rb_intern("new"), 2, INT2NUM(width), INT2NUM(height));
+    magickImageClass = rb_path2class("Magick::Image");
+    outputImage = rb_funcall(magickImageClass, rb_intern("new"), 2, INT2NUM(width), INT2NUM(height));
 
     rb_funcall(outputImage, rb_intern("import_pixels"), 7,
                INT2NUM(0),
@@ -129,5 +155,40 @@ void Init_Rdmtx() {
     cRdmtx = rb_define_class("Rdmtx", rb_cObject);
     rb_define_method(cRdmtx, "initialize", rdmtx_init, 0);
     rb_define_method(cRdmtx, "decode", rdmtx_decode, 2);
-    rb_define_method(cRdmtx, "encode", rdmtx_encode, 3);
+    rb_define_method(cRdmtx, "encode", rdmtx_encode, -1);
+
+    rb_define_global_const("DmtxSymbolRectAuto", INT2FIX(DmtxSymbolRectAuto));
+    rb_define_global_const("DmtxSymbolSquareAuto", INT2FIX(DmtxSymbolSquareAuto));
+    rb_define_global_const("DmtxSymbolShapeAuto", INT2FIX(DmtxSymbolShapeAuto));
+
+    rb_define_global_const("DmtxSymbol10x10", INT2FIX(DmtxSymbol10x10));
+    rb_define_global_const("DmtxSymbol12x12", INT2FIX(DmtxSymbol12x12));
+    rb_define_global_const("DmtxSymbol14x14", INT2FIX(DmtxSymbol14x14));
+    rb_define_global_const("DmtxSymbol16x16", INT2FIX(DmtxSymbol16x16));
+    rb_define_global_const("DmtxSymbol18x18", INT2FIX(DmtxSymbol18x18));
+    rb_define_global_const("DmtxSymbol20x20", INT2FIX(DmtxSymbol20x20));
+    rb_define_global_const("DmtxSymbol22x22", INT2FIX(DmtxSymbol22x22));
+    rb_define_global_const("DmtxSymbol24x24", INT2FIX(DmtxSymbol24x24));
+    rb_define_global_const("DmtxSymbol26x26", INT2FIX(DmtxSymbol26x26));
+    rb_define_global_const("DmtxSymbol32x32", INT2FIX(DmtxSymbol32x32));
+    rb_define_global_const("DmtxSymbol36x36", INT2FIX(DmtxSymbol36x36));
+    rb_define_global_const("DmtxSymbol40x40", INT2FIX(DmtxSymbol40x40));
+    rb_define_global_const("DmtxSymbol44x44", INT2FIX(DmtxSymbol44x44));
+    rb_define_global_const("DmtxSymbol48x48", INT2FIX(DmtxSymbol48x48));
+    rb_define_global_const("DmtxSymbol52x52", INT2FIX(DmtxSymbol52x52));
+    rb_define_global_const("DmtxSymbol64x64", INT2FIX(DmtxSymbol64x64));
+    rb_define_global_const("DmtxSymbol72x72", INT2FIX(DmtxSymbol72x72));
+    rb_define_global_const("DmtxSymbol80x80", INT2FIX(DmtxSymbol80x80));
+    rb_define_global_const("DmtxSymbol88x88", INT2FIX(DmtxSymbol88x88));
+    rb_define_global_const("DmtxSymbol96x96", INT2FIX(DmtxSymbol96x96));
+    rb_define_global_const("DmtxSymbol104x104", INT2FIX(DmtxSymbol104x104));
+    rb_define_global_const("DmtxSymbol120x120", INT2FIX(DmtxSymbol120x120));
+    rb_define_global_const("DmtxSymbol132x132", INT2FIX(DmtxSymbol132x132));
+    rb_define_global_const("DmtxSymbol144x144", INT2FIX(DmtxSymbol144x144));
+    rb_define_global_const("DmtxSymbol8x18", INT2FIX(DmtxSymbol8x18));
+    rb_define_global_const("DmtxSymbol8x32", INT2FIX(DmtxSymbol8x32));
+    rb_define_global_const("DmtxSymbol12x26", INT2FIX(DmtxSymbol12x26));
+    rb_define_global_const("DmtxSymbol12x36", INT2FIX(DmtxSymbol12x36));
+    rb_define_global_const("DmtxSymbol16x36", INT2FIX(DmtxSymbol16x36));
+    rb_define_global_const("DmtxSymbol16x48", INT2FIX(DmtxSymbol16x48));
 }

metadata

@@ -1,32 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: Rdmtx
 version: !ruby/object:Gem::Version
-  version: 0.2.2
-  prerelease: 
+  version: 0.3.0
 platform: ruby
 authors:
 - Srijan Choudhary
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-13 00:00:00.000000000 Z
+date: 2016-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rmagick
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.16'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.16'
 description: This is a ruby wrapper for libdmtx, which is a open source software for
   reading and writing Data Matrix barcodes.
 email: srijan4@gmail.com
@@ -38,28 +35,28 @@ files:
 - ext/rdmtx/Rdmtx.c
 - ext/rdmtx/extconf.rb
 homepage: https://github.com/srijan/ruby-dmtx
-licenses: []
+licenses:
+- LGPL-2.1
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
 - libdmtx
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.5.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Ruby libdmtx wrapper
 test_files: []