cheetah_qrcode 1.0.2 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b29d21d21eec28473d59567fa25267c61c18ad20192833cd31f9bbe415b5ff99
-  data.tar.gz: 49baa7dcb9bae3524c6a179d6857e8d004a3056695bbd2586928396222b1e643
+  metadata.gz: a68495ab66ea6215e93529c0b209671296ac3f440be78c383e5ea65c8344c971
+  data.tar.gz: 3e6878b91abd7c059ee8d49477a694083f79b99770da9b5fd11dd5aebdabdea5
 SHA512:
-  metadata.gz: 177e1343d936bf964a5bc3d83cade60e618b1d6e2d16fa980950977095c83a964c85edd13ab0bc1357da71e427cc18014882bd5f813c5dd0771e9c90be940dfc
-  data.tar.gz: 770a535c33374561f6a3d4133bd68871bcb0224c7796aba15cfc6464a1e159ae71ffd20ebd1c4aed6118cf5eb72cfc312604ebb2955e84a2d3e7405653732b3a
+  metadata.gz: 9224f5cb85e7644bd90caee0bab897298362e095638b7556d36a91c948322e46a5ed609fa4e9591a8a52f32e49ae43dbfcd34a4da9fce21eb0bc5204285fe2d1
+  data.tar.gz: cbebc39cd356cdc55538299936f39bf5ce28f5e92c6981c501de8cad723c3fb1aa25bd079eb3cda3d140a4162da308d5dab509c9ffa807be9593b10a59767d39

data/ext/cheetah_qrcode/cheetah_qrcode.c

@@ -24,12 +24,20 @@ static VALUE encode_text(int argc, VALUE* argv, VALUE self) {
                 rb_raise(rb_eTypeError, "Invalid text");
         }
 
-        if (rb_type(arg_ec_level) == T_SYMBOL) {
-                arg_ec_level = RB_SYM2ID(arg_ec_level);
-        } else {
+        if (rb_type(arg_ec_level) != T_SYMBOL) {
                 rb_raise(rb_eTypeError, "Invalid error correction level, use :L, :M, :Q, :H");
         }
 
+        if (rb_type(arg_border) != T_FIXNUM) {
+                rb_raise(rb_eTypeError, "Invalid border");
+        }
+
+        if (rb_type(arg_size) != T_FIXNUM) {
+                rb_raise(rb_eTypeError, "Invalid size");
+        }
+
+        arg_ec_level = RB_SYM2ID(arg_ec_level);
+
         if (arg_ec_level == rb_intern("L") || arg_ec_level == rb_intern("l")) {
                 qrcode_ec_level = qrcodegen_Ecc_LOW;
         } else if (arg_ec_level == rb_intern("M") || arg_ec_level == rb_intern("m")) {
@@ -42,16 +50,18 @@ static VALUE encode_text(int argc, VALUE* argv, VALUE self) {
                 rb_raise(rb_eTypeError, "Invalid error correction level, use :L, :M, :Q, :H");
         }
 
-        if (rb_type(arg_border) == T_FIXNUM) {
-                qrcode_border = RB_NUM2UINT(arg_border);
-        } else {
-                rb_raise(rb_eTypeError, "Invalid border");
+        qrcode_border = RB_NUM2UINT(arg_border);
+
+        // The max version qrcode is only 117 wide
+        if (qrcode_border > 128) {
+                rb_raise(rb_eTypeError, "Border too large");
         }
 
-        if (rb_type(arg_size) == T_FIXNUM) {
-                image_size = RB_NUM2UINT(arg_size);
-        } else {
-                rb_raise(rb_eTypeError, "Invalid size");
+        image_size = RB_NUM2UINT(arg_size);
+
+        // 204800x204800 will use 5000MiB memory for image buffer
+        if (image_size > 204800) {
+                rb_raise(rb_eTypeError, "Image size too large");
         }
 
         bool ok = qrcodegen_encodeText(
@@ -96,7 +106,21 @@ static VALUE encode_text(int argc, VALUE* argv, VALUE self) {
         // Create image initialized to 0 (Entirely black image)
         image = calloc(image_length, sizeof(uint8_t));
         if (!image) {
-                rb_raise(rb_eRuntimeError, "Unable to create image buffer");
+                rb_raise(rb_eRuntimeError, "Unable to create image buffer for %lu bytes", image_length);
+        }
+
+        // Lookup map for qrcode-to-image pixel conversion
+        size_t image_scale_map[qrcode_size + 1];
+
+        // First pixel always start at 0
+        image_scale_map[0] = 0;
+
+        // Last pixel always end at image_size
+        image_scale_map[qrcode_size] = image_size;
+
+        // Precompute image scale pixels
+        for (size_t i = 1; i < qrcode_size; i++) {
+                image_scale_map[i] = (size_t)(i * image_scale);
         }
 
         // Loop through qrcode to find white modules to write into image
@@ -108,48 +132,32 @@ static VALUE encode_text(int argc, VALUE* argv, VALUE self) {
                         }
 
                         // Map current qrcode module to image coordinates
-                        size_t ix_begin = (size_t)(qx * image_scale) + 1;
-                        size_t ix_end = (size_t)((qx + 1) * image_scale) + 1;
-                        size_t iy_begin = (size_t)(qy * image_scale) + 1;
-                        size_t iy_end = (size_t)((qy + 1) * image_scale) + 1;
-
-                        // Fix offset for the first pixel
-                        if (qx == 0) {
-                                ix_begin = 0;
-                        }
-                        if (qy == 0) {
-                                iy_begin = 0;
-                        }
-
-                        // For boundary safety
-                        if (ix_end > image_size) {
-                                ix_end = image_size;
-                        }
-                        if (iy_end > image_size) {
-                                iy_end = image_size;
-                        }
+                        size_t ix_begin = image_scale_map[qx];
+                        size_t ix_end = image_scale_map[qx + 1];
+                        size_t iy_begin = image_scale_map[qy];
+                        size_t iy_end = image_scale_map[qy + 1];
 
                         // Fill white pixels into image at unit of bytes
                         for (size_t iy = iy_begin; iy < iy_end; iy++) {
                                 size_t ix = ix_begin;
-                                size_t ix_diff = ix_end - ix_begin;
+                                size_t bits_remaining = ix_end - ix_begin;
 
-                                while (ix_diff > 0) {
+                                while (bits_remaining > 0) {
                                         size_t i = (iy * image_scanline_width) + (ix / 8);
 
                                         uint8_t byte_value = 0xFF;
                                         uint8_t bits_needed = 8 - (ix % 8);
 
-                                        if (bits_needed > ix_diff) {
-                                                byte_value <<= (bits_needed - ix_diff);
-                                                bits_needed = ix_diff;
+                                        if (bits_needed > bits_remaining) {
+                                                bits_needed = bits_remaining;
+                                                byte_value <<= (8 - bits_needed);
                                         }
 
                                         byte_value >>= (ix % 8);
                                         image[i] |= byte_value;
 
                                         ix += bits_needed;
-                                        ix_diff -= bits_needed;
+                                        bits_remaining -= bits_needed;
                                 }
                         }
                 }

data/lib/cheetah_qrcode/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CheetahQRCode
-  VERSION = '1.0.2'
+  VERSION = '1.0.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cheetah_qrcode
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.4
 platform: ruby
 authors:
 - atitan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2025-04-28 00:00:00.000000000 Z
+date: 2025-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake