qrest 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 28f37a9b5e5fb20a07f781323ce9f2381ecadd873bec290b5b65811849adb563
-  data.tar.gz: 7ba9b8e971a1e76bb5869455a15f0973f29575a82a11d671656070a16ae1cfe0
+  metadata.gz: fa479ca4948c34f366ab8c290b4f89f2cca17d0cbe642b1104c010b0e0c83570
+  data.tar.gz: 724aa39b76303cc0c965e0f322aacb263a0d9ec2d7f18017c522509774fbfedb
 SHA512:
-  metadata.gz: 5d592804716c69561ceb2cd556c7581302a485c7925c6908d956ebeeb7277011da21cf07867af837942813073d7e0307b7af27e74f7911180b8bbf1a8c11ff23
-  data.tar.gz: 72830cd5baadaefc25cade7df5a7a82af010a79ecb78f54e576c90551b09a2e072f943c42306f31e8fd873befaba0d63fdb495b26cb4188f9cbca3234b8c0e30
+  metadata.gz: 1ede4940c060aeaa5dfc861b204b1b340999b645943e5505a9e8d04a7962d759a92feb19f09258b7f3667b556e3dfa3531a6ce9fde71b5333e8fa619a8ac8a9a
+  data.tar.gz: 38b9da529c02d8b9631f996cbaabc79df840eacf82077d71afdf4ef3e3da20d8223b5badc0a3cf635ccf054cb36e2039e7a14a14583d66dc531e3620c6108c12

data/lib/qrest/bch.rb

@@ -24,9 +24,9 @@ module QRest
 
     end
 
-    G15      = 0b000010100110111
-    G15_MASK = 0b101010000010010
-    G18      = 0b001111100100101
+    G15      = 0b0_0000_0101_0011_0111
+    G15_MASK = 0b0_0101_0100_0001_0010
+    G18      = 0b0_0001_1111_0010_0101
 
     G15D = digit G15
     G18D = digit G18
@@ -34,19 +34,19 @@ module QRest
     class <<self
 
       def format_info data
-        d = data << 10
+        d = e = data << 10
         until (m = (digit d) - G15D) < 0 do
           d ^= G15 << m
         end
-        ((data << 10) | d) ^ G15_MASK
+        (e | d) ^ G15_MASK
       end
 
       def version data
-        d = data << 12
+        d = e = data << 12
         until (m = (digit d) - G18D) < 0 do
           d ^= G18 << m
         end
-        (data << 12) | d
+        e | d
       end
 
     end

data/lib/qrest/modules.rb

@@ -271,7 +271,8 @@ module QRest
     def walk_fields mask_pattern
       # An image says more than a thousand statements:
       # <https://en.wikipedia.org/wiki/QR_code#Message_placement>
-      mp = MASK_PATTERNS[ mask_pattern] or raise ArgumentError, "Bad mask_pattern: #{mask_pattern}"
+      mp = MASK_PATTERNS[ mask_pattern] or
+        raise ArgumentError, "Bad mask_pattern: #{mask_pattern}"
       row = c2 = @fields.size - 1
       inc = -1
       loop do

data/lib/qrest/polynomial.rb

@@ -18,7 +18,7 @@ module QRest
           if error_correct_length > 0 then
             e = error_correct_length - 1
             ge = new [1, 0]
-            ge.gexp! 1, e
+            ge.gfexp! 1, e
             (error_correct e).multiply ge
           else
             new [1]
@@ -57,55 +57,61 @@ module QRest
       @num.unshift 0 until @num.length >= n
     end
 
-    def first_glog
-      Polynomial.glog @num.first
+    def first_gflog
+      Polynomial.gflog @num.first
     end
 
-    def each_glog
+    def each_gflog
       @num.each_with_index { |n,i|
-        yield (Polynomial.glog n), i
+        yield (Polynomial.gflog n), i
       }
     end
 
-    def gexp! i, n
-      @num[ i] ^= Polynomial.gexp n
+    def gfexp! i, n
+      @num[ i] ^= Polynomial.gfexp n
     end
 
     def multiply e
       r = Polynomial.zeroes length + e.length - 1
-      each_glog { |gi,i|
-        e.each_glog { |gj,j|
-          r.gexp! i + j, gi + gj
+      each_gflog { |gi,i|
+        e.each_gflog { |gj,j|
+          r.gfexp! i + j, gi + gj
         }
       }
       r
     end
 
     def error_mod error_count
-      e = Polynomial.error_correct error_count
-      ef = e.first_glog
       p = dup
-      p.extend! error_count
+      p.error_mod! error_count
+    end
+
+    def error_mod! error_count
+      e = Polynomial.error_correct error_count
+      extend! error_count
       loop do
-        p.norm!
-        break if p.length < e.length
-        ratio = p.first_glog - ef
-        e.each_glog { |gi,i|
-          p.gexp! i, ratio + gi
+        norm!
+        break if length < e.length
+        f = first_gflog
+        e.each_gflog { |gi,i|
+          gfexp! i, gi + f
         }
       end
-      p.grow! error_count
-      p
+      grow! error_count
+      self
     end
 
 
-    EXP_TABLE = []
-    (0...8).each do |i|
-      EXP_TABLE.push 1 << i
-    end
-    (8...256).each do |i|
-      EXP_TABLE.push EXP_TABLE[i-4] ^ EXP_TABLE[i-5] ^ EXP_TABLE[i-6] ^ EXP_TABLE[i-8]
+    EXP_TABLE = [1]
+    loop do
+      x = x_ = EXP_TABLE.last << 1
+      x &= 0xff
+      x ^= 0x1d if x != x_
+      break if x == EXP_TABLE.first
+      EXP_TABLE.push x
     end
+    EXP_TABLE
+
 
     LOG_TABLE = [nil] * 256
     255.times do |i|
@@ -117,15 +123,12 @@ module QRest
 
     class <<self
 
-      def glog n
-        n >= 1 or raise Error, "Internal error: glog(#{n})."
-        LOG_TABLE[n]
+      def gflog n
+        LOG_TABLE[n] or raise ArgumentError, "Argument is out of domain: gflog(#{n})."
       end
 
-      def gexp n
-        while n <  0   do n += 255 end
-        while n >= 256 do n -= 255 end
-        EXP_TABLE[n]
+      def gfexp n
+        EXP_TABLE[n % 255]
       end
 
     end

data/lib/qrest/rsblocks.rb

@@ -46,8 +46,9 @@ module QRest
       each do |rs|
         p = Polynomial.new buffer[ i, rs.data_count]
         i += rs.data_count
-        dcdata.push p.num
-        ecdata.push (p.error_mod rs.error_count).num
+        dcdata.push p.num.dup
+        p.error_mod! rs.error_count
+        ecdata.push p.num
       end
       data = []
       (max :data_count).times do |j|

data/lib/qrest/version.rb

@@ -6,7 +6,7 @@
 module QRest
 
   NAME    = "qrest"
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: qrest
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Bertram Scharpf
 bindir: bin
 cert_chain: []
-date: 2025-03-16 00:00:00.000000000 Z
+date: 2025-03-26 00:00:00.000000000 Z
 dependencies: []
 description: |
   A Ruby library that generates QR Codes
@@ -50,7 +50,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.4
+rubygems_version: 3.6.6
 specification_version: 4
 summary: Generate QR Codes
 test_files: []