ruby-zint 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a753e1ebfd854bc234589e6b9732f2d70b0d0b17b2d35f2c6db4034940e967b5
-  data.tar.gz: ba1b5c447cb537f59d87536cc74eddae3a26c761880f46c10bcb009a4e73d9d6
+  metadata.gz: b952e9f08564e922af202d914688cf69a6d1fb424c09f8f0b28a623ae181a1b7
+  data.tar.gz: d480672da3110d322d84395ca8e5cb3f43e0c6433dc6170b1953e370dd0d88dc
 SHA512:
-  metadata.gz: dd4f60016c320e26975c46d75819a04362db6194750ec0a11843b7f39c1a76d2e4e1181a79b594564c6e14f5a08a83cc5782c22e972f09f63bd39e046306f54c
-  data.tar.gz: ce2c6c7f55f1f6f92b3b54dedae4c3c4d72997d807abfa96acece06a03d67cc14627f5f8276032b7edee508906008fc33c03c3da5b45a7cd070dcb491da0498f
+  metadata.gz: c1aec4ba89a8117bf44121f427bf067ae15eb1df8f2d113c6d78dbb5d5fc866c344c499ca0de4dae69dc65691bd208893126315de462ab7d5836e86ebfa54841
+  data.tar.gz: '0619a5512ca7ba501f63e90c84015ddd28c6256cf162904e47b0d2ce869c1803ad0b2b5d575cc20af2a49985f9b997cf549b5c1b96ed6129f14901b840a62fed'

data/README.md

@@ -8,26 +8,44 @@ See the [documentation](https://rubydoc.info/github/api-walker/ruby-zint) for a
 
 ## Installation
 
+Install via RubyGems:
+
+    gem install ruby-zint
+
+This installs the binary gem, specific to the running platform by default.
+
+### Binary gem
+
+The binary gems don't depend on the libzint package on the running system or on CMake or libpng.
+They have libzint builtin and should just work.
+
+### Source gem
+
+If for some reason the binary gem doesn't work for you, the source gem can be installed alternatively.
+It can be forced by:
+
+    gem uninstall ruby-zint --all
+    gem install ruby-zint --platform ruby
+
 By default ruby-zint first tries to use libzint installed on the system.
-If libzint can't be found or if it isn't a supported version, then the zint version, bundled into the gem, is compiled and used.
+If libzint can't be found or if it isn't a supported version, then the zint version, bundled into the gem, is compiled and used instead.
 Both install methods can be enforced by using `--enable-system-libzint` or `--disable-system-libzint` options, see below.
 
-### With libzint source code (recommended)
+#### With libzint source code (recommended)
 First install CMake with your package manager (e. g. `apt install cmake`).
-
+Please also install libpng (e. g. `apt install libpng-dev`) before installing the gem if you want to use the PNG format.
 Afterwards install the gem and force builtin libzint:
 
 ```
 $ gem install ruby-zint -- --disable-system-libzint
 ```
 
-### With system libraries
+#### With system libraries
 
 Install the libzint binary with your package manager (e. g. `apt install zint` or perhaps `brew install zint`).
-
 Other platforms require building [from source](https://www.zint.org.uk/manual/chapter/2).
 
-**NOTE:** It is assumed that you are using libzint with the version [2.12](https://sourceforge.net/projects/zint/files/zint/2.12.0/).
+**NOTE:** It is assumed that you are using libzint with the version [2.15](https://sourceforge.net/projects/zint/files/zint/2.15.0/).
 
 Then install this gem and enforce system libzint:
 
@@ -38,15 +56,29 @@ $ gem install ruby-zint -- --enable-system-libzint
 ### Gemfile
 
 Include `gem "ruby-zint"` in your Gemfile.
-Optionally set the install option by running bundler like so:
+To make sure, the necessary platforms and the source gem are fetched by bundler, they can be added like so
 
 ```
-bundle config build.ruby-zint --enable-system-libzint
+bundle lock --add-platform x86_64-linux-gnu
+bundle lock --add-platform arm64-darwin
+bundle lock --add-platform x64-mingw-ucrt
+bundle lock --add-platform ruby
+bundle package --all-platforms
+```
+
+A re-run of `bundle package` is also necessary after `bundle update`, in order to retrieve the new specific gems of all platforms.
+
+If the binary gems don't work for some reason, it's easy to force the usage of the source gem in the Gemfile:
+
+```
+gem "ruby-zint", force_ruby_platform: true
 ```
 
-### PNG support
+Optionally set the install option by running bundler like so:
 
-Please install libpng (e. g. `apt install libpng-dev`) before installing the gem if you want to use the PNG format.
+```
+bundle config build.ruby-zint --enable-system-libzint
+```
 
 ## Usage
 

data/ext/ruby-zint/extconf.rb

@@ -45,20 +45,41 @@ def libzint_usable?
   m = Module.new do
     extend FFI::Library
 
-    ffi_lib(%w[libzint.so.2.12 libzint zint])
+    ffi_lib(%w[libzint.so.2.15 libzint zint])
     attach_function(:ZBarcode_Version, [], :int32)
   end
 
-  (21200...21300) === m.ZBarcode_Version
+  (21500...21600) === m.ZBarcode_Version
 rescue LoadError
   false
 end
 
 def build_bundled_libzint
-  puts "Build"
+  puts "Build libzint and dependencies"
   require_relative "../../lib/zint/zint_recipe"
 
-  recipe = Zint::ZintRecipe.new
+  recipe_zlib = Zint::ZintRecipe.new("zlib", Zint::LIBZ_VERSION, Zint::LIBZ_SOURCE_URI, Zint::LIBZ_SOURCE_SHA1)
+  recipe_zlib.configure_options += [
+    "-DCMAKE_C_FLAGS=-fPIC",
+    "-DZLIB_SHARED=OFF"
+  ]
+  recipe_zlib.cook_and_activate
+
+  recipe_png = Zint::ZintRecipe.new("libpng", Zint::LIBPNG_VERSION, Zint::LIBPNG_SOURCE_URI, Zint::LIBPNG_SOURCE_SHA1)
+  recipe_png.configure_options += [
+    "-DCMAKE_C_FLAGS=-fPIC",
+    "-DZLIB_ROOT=#{recipe_zlib.path}",
+    "-DPNG_SHARED=OFF"
+  ]
+  recipe_png.cook_and_activate
+
+  recipe = Zint::ZintRecipe.new("libzint", Zint::ZINT_VERSION, Zint::ZINT_SOURCE_URI, Zint::ZINT_SOURCE_SHA1)
+  recipe.configure_options += [
+    "-DZLIB_INCLUDE_DIR=#{recipe_zlib.path}/include",
+    "-DZLIB_LIBRARY=#{recipe_zlib.path}/lib/#{(RUBY_PLATFORM =~ /mingw/) ? "libzlibstatic.a" : "libz.a"}",
+    "-DPNG_PNG_INCLUDE_DIR=#{recipe_png.path}/include",
+    "-DPNG_LIBRARY=#{recipe_png.path}/lib/libpng.a"
+  ]
   recipe.cook_and_activate
   recipe.path
 end
@@ -69,6 +90,11 @@ unless enable_config("system-libzint", libzint_usable?)
   libzint_path = build_bundled_libzint
 end
 
+if libzint_path
+  # For cross compiled gem
+  FileUtils.cp Dir["#{libzint_path}/*/libzint.*"].first, "libzint.#{RbConfig::CONFIG["DLEXT"]}", verbose: true
+end
+
 # Create a Makefile which copies the libzint library files to the gem's lib dir.
 File.open("Makefile", "wb") do |mf|
   mf.puts <<~EOT
@@ -79,6 +105,7 @@ File.open("Makefile", "wb") do |mf|
   EOT
 
   if libzint_path
+    # Only executed in source build
     mf.puts <<-EOT
 	cp -r #{libzint_path.dump}/*/libzint* $(RUBYARCHDIR)
     EOT

data/lib/zint/barcode.rb

@@ -16,10 +16,11 @@ module Zint
 
     # @param value [String, NilClass] Content of the barcode
     # @param input_file [String, NilClass] Path to input file with content of the barcode
+    # @param segments [Array<Hash>, NilClass] Array of ECI segments to encode
     # @param symbology [Integer] Type of barcode
     # @param kwargs [Hash] Specific options for zint symbol (height, scale, ...)
-    def initialize(value: nil, input_file: nil, symbology: Zint::BARCODE_CODE128, **kwargs)
-      raise ArgumentError, "value or input_file must be given!" if value&.empty? && input_file&.empty?
+    def initialize(value: nil, input_file: nil, segments: nil, symbology: Zint::BARCODE_CODE128, **kwargs)
+      raise ArgumentError, "value, input_file or segments must be given!" if value&.empty? && input_file&.empty? && segments.nil?
       raise ArgumentError, "input_file not found!" if input_file && !File.exist?(input_file)
 
       @zint_symbol = Native.ZBarcode_Create
@@ -30,6 +31,7 @@ module Zint
 
       @value = value
       @input_file = input_file
+      encode_segments(segments)
     end
 
     # Exports barcode to file
@@ -46,6 +48,8 @@ module Zint
 
       if input_file
         call_function(:ZBarcode_Encode_File_and_Print, @zint_symbol, input_file, rotate_angle)
+      elsif @p_segments
+        call_seg_function(:ZBarcode_Encode_Segs_and_Print, rotate_angle)
       else
         call_function(:ZBarcode_Encode_and_Print, @zint_symbol, value, value.bytesize, rotate_angle)
       end
@@ -57,17 +61,11 @@ module Zint
     # @param rotate_angle [Integer] Rotate angle in degrees (0, 90, 180, 270)
     # @return [String] Exported memory file
     def to_memory_file(extension: ".png", rotate_angle: 0)
-      require "tempfile"
-      file = Tempfile.new(["zint", extension])
+      @zint_symbol[:output_options] = Zint::BARCODE_MEMORY_FILE
 
-      to_file(path: file.path, rotate_angle: rotate_angle)
+      to_file(path: extension, rotate_angle: rotate_angle)
 
-      file.rewind
-      buffer = file.read
-      file.close
-      file.unlink
-
-      buffer
+      @zint_symbol[:memfile].read_bytes(@zint_symbol[:memfile_size])
     end
 
     # Exports barcode to buffer
@@ -82,11 +80,13 @@ module Zint
 
       if input_file
         call_function(:ZBarcode_Encode_File_and_Buffer, @zint_symbol, input_file, rotate_angle)
+      elsif @p_segments
+        call_seg_function(:ZBarcode_Encode_Segs_and_Buffer, rotate_angle)
       else
         call_function(:ZBarcode_Encode_and_Buffer, @zint_symbol, value, value.bytesize, rotate_angle)
       end
 
-      @zint_symbol[:bitmap].read_bytes((@zint_symbol[:bitmap_width] * @zint_symbol[:bitmap_height]))
+      @zint_symbol[:bitmap].read_bytes(@zint_symbol[:bitmap_width] * @zint_symbol[:bitmap_height])
     end
 
     # Exports barcode to buffer
@@ -116,6 +116,8 @@ module Zint
       end
       if input_file
         call_function(:ZBarcode_Encode_File_and_Buffer_Vector, @zint_symbol, input_file, rotate_angle)
+      elsif @p_segments
+        call_seg_function(:ZBarcode_Encode_Segs_and_Buffer_Vector, rotate_angle)
       else
         call_function(:ZBarcode_Encode_and_Buffer_Vector, @zint_symbol, value, value.bytesize, rotate_angle)
       end
@@ -134,6 +136,8 @@ module Zint
     def encode
       if input_file
         call_function(:ZBarcode_Encode_File, @zint_symbol, input_file)
+      elsif @p_segments
+        call_seg_function(:ZBarcode_Encode_Segs)
       else
         call_function(:ZBarcode_Encode, @zint_symbol, value, value.bytesize)
       end
@@ -314,18 +318,6 @@ module Zint
       @zint_symbol[:show_hrt] = show_hrt
     end
 
-    # Gets font size of barcode
-    def fontsize
-      @zint_symbol[:fontsize]
-    end
-
-    # Sets font size of barcode (Unused)
-    #
-    # @param fontsize [Integer] Font size of barcode
-    def fontsize=(fontsize)
-      @zint_symbol[:fontsize] = fontsize
-    end
-
     # Gets input mode of barcode
     def input_mode
       @zint_symbol[:input_mode]
@@ -388,7 +380,7 @@ module Zint
 
     # Human Readable Text, which usually consists of input data plus one more check digit. Uses UTF-8 formatting.
     def text
-      @zint_symbol[:text].to_s.force_encoding(Encoding::UTF_8)
+      @zint_symbol[:text].to_ptr.read_bytes(@zint_symbol[:text_length]).force_encoding(Encoding::UTF_8)
     end
 
     # Gets rows of barcode
@@ -479,11 +471,6 @@ module Zint
       @zint_symbol[:bitmap_height]
     end
 
-    # Gets bitmap byte length of barcode
-    def bitmap_byte_length
-      @zint_symbol[:bitmap_byte_length]
-    end
-
     # Gets dot size of barcode
     def dot_size
       @zint_symbol[:dot_size]
@@ -535,5 +522,29 @@ module Zint
 
       error_code
     end
+
+    def call_seg_function(function_name, *args)
+      call_function(function_name, @zint_symbol, @p_segments, @p_strings.size, *args)
+    end
+
+    def encode_segments(segments)
+      @p_segments = nil
+      return unless segments
+
+      raise ArgumentError, "segments must be Array<Hash<source: String, eci: Integer>>!" if !segments.is_a?(Array) || !segments.first.is_a?(Hash)
+
+      @p_segments = FFI::MemoryPointer.new Structs::Seg, segments.size
+      @p_strings = [] # Prevent garbage collection
+      segments.each_with_index do |seg, sidx|
+        p_seg = Structs::Seg.new(@p_segments + Structs::Seg.size * sidx)
+        source = seg[:source] || raise(ArgumentError, ":source not defined")
+        eci = seg[:eci] || raise(ArgumentError, ":eci not defined")
+
+        @p_strings << FFI::MemoryPointer.from_string(source)
+        p_seg[:source] = @p_strings.last
+        p_seg[:length] = source.bytesize
+        p_seg[:eci] = eci
+      end
+    end
   end
 end

data/lib/zint/constants/errors.rb

@@ -12,7 +12,8 @@ module Zint
         error_memory: 11,
         error_file_write: 12,
         error_uses_eci: 13,
-        error_noncompliant: 14
+        error_noncompliant: 14,
+        error_hrt_truncated: 15  # Error counterpart of warning if WARN_FAIL_ALL set */
       }
     end
   end

data/lib/zint/constants/input_data_types.rb

@@ -10,6 +10,7 @@ module Zint
       GS1NOCHECK_MODE = 0x0020 #  Do not check validity of GS1 data (except that printable ASCII only)
       HEIGHTPERROW_MODE = 0x0040 #  Interpret `height` as per-row rather than as overall height
       FAST_MODE = 0x0080 #  Use faster if less optimal encodation or other shortcuts if available (affects DATAMATRIX, MICROPDF417, PDF417, QRCODE & UPNQR only)
+      EXTRA_ESCAPE_MODE = 0x0100 # Process special symbology-specific escape sequences as well as others. Note: currently Code 128 only.
     end
   end
 end

data/lib/zint/constants/output_options.rb

@@ -16,6 +16,9 @@ module Zint
       BARCODE_QUIET_ZONES = 0x0800 # Add compliant quiet zones (additional to any specified whitespace); Note: CODE16K, CODE49, CODABLOCKF, ITF14, EAN/UPC have default quiet zones */
       BARCODE_NO_QUIET_ZONES = 0x1000 # Disable quiet zones, notably those with defaults as listed above */
       COMPLIANT_HEIGHT = 0x2000 # Warn if height not compliant and use standard height (if any) as default */
+      EANUPC_GUARD_WHITESPACE = 0x04000 # Add quiet zone indicators ("<"/">") to HRT whitespace (EAN/UPC) */
+      EMBED_VECTOR_FONT = 0x08000 # Embed font in vector output - currently only for SVG output */
+      BARCODE_MEMORY_FILE = 0x10000 # Write output to in-memory buffer `memfile` instead of to `outfile` */
     end
   end
 end

data/lib/zint/constants/specific_options.rb

@@ -4,6 +4,7 @@ module Zint
     module SpecificOptions
       DM_SQUARE = 100 # Only consider square versions on automatic symbol size selection
       DM_DMRE = 101 # Consider DMRE versions on automatic symbol size selection
+      DM_ISO_144 = 128 # Use ISO instead of "de facto" format for 144x144 (i.e. don't skew ECC)
 
       ZINT_FULL_MULTIBYTE = 200 # Enable Kanji/Hanzi compression for Latin-1 & binary data
       ULTRA_COMPRESSION = 128 # Enable Ultracode compression (experimental)

data/lib/zint/constants/symbologies.rb

@@ -131,7 +131,8 @@ module Zint
       BARCODE_ULTRA = 144 #  Ultracode
       BARCODE_RMQR = 145 #  Rectangular Micro QR Code (rMQR)
       BARCODE_BC412 = 146 # IBM BC412 (SEMI T1-95)
-      BARCODE_LAST = 146 # Max barcode number marker, not barcode
+      BARCODE_DXFILMEDGE = 147 # DX Film Edge Barcode on 35mm and APS films
+      BARCODE_LAST = 147 # Max barcode number marker, not barcode
     end
   end
 end

data/lib/zint/dependencies.rb

@@ -1,7 +1,15 @@
 module Zint
-  ZINT_VERSION = ENV["ZINT_VERSION"] || "2.12.0"
+  LIBZ_VERSION = ENV["LIBZ_VERSION"] || "1.3.1"
+  LIBZ_SOURCE_URI = "http://zlib.net/fossils/zlib-#{LIBZ_VERSION}.tar.gz"
+  LIBZ_SOURCE_SHA1 = "f535367b1a11e2f9ac3bec723fb007fbc0d189e5"
+
+  ZINT_VERSION = ENV["ZINT_VERSION"] || "2.15.0"
   ZINT_SOURCE_URI = "https://downloads.sourceforge.net/zint/zint-#{ZINT_VERSION}-src.tar.gz"
-  ZINT_SOURCE_SHA1 = "6e16036d9822895edededd96e65da755ef3fdb69"
+  ZINT_SOURCE_SHA1 = "e18966972d77feaa62a33d73d2f06ffec3356f66"
+
+  LIBPNG_VERSION = ENV["LIBPNG_VERSION"] || "1.6.50"
+  LIBPNG_SOURCE_URI = "https://netcologne.dl.sourceforge.net/project/libpng/libpng16/#{LIBPNG_VERSION}/libpng-#{LIBPNG_VERSION}.tar.xz"
+  LIBPNG_SOURCE_SHA1 = "ecd92ba84628a8ace430706c85fd2fb26ba0882c"
 
   MINI_PORTILE_VERSION = "~> 2.1"
 end

data/lib/zint/dxfilmedge.rb

@@ -0,0 +1,8 @@
+module Zint
+  # DX Film Edge Barcode on 35mm and APS films
+  class Dxfilmedge < Barcode
+    def initialize(value: nil, input_file: nil, **kwargs)
+      super(value: value, input_file: input_file, symbology: Zint::BARCODE_DXFILMEDGE, **kwargs)
+    end
+  end
+end

data/lib/zint/native.rb

@@ -5,7 +5,9 @@ module Zint
     root_path = File.expand_path("../../..", __FILE__)
     prefix = FFI::Platform::LIBPREFIX.empty? ? "lib" : FFI::Platform::LIBPREFIX
     bundled_dll = File.join(root_path, "lib/#{prefix}zint.#{FFI::Platform::LIBSUFFIX}")
-    ffi_lib [bundled_dll, "libzint.so.2.12", "libzint", "zint"]
+    native_gem1 = File.join(root_path, "lib/3.4/libzint.#{RbConfig::CONFIG["DLEXT"]}") # This is where rake-compiler places the file in the gem
+    native_gem2 = File.join(root_path, "lib/3.0/libzint.#{RbConfig::CONFIG["DLEXT"]}") # ... for non-ucrt windows builds
+    ffi_lib [bundled_dll, native_gem1, native_gem2, "libzint.so.2.15", "libzint", "zint"]
 
     # Error codes (API return values)
     enum :error_code, [Constants::Warnings::WARNINGS, Constants::Errors::ERRORS].map { |h| h.to_a }.flatten
@@ -20,57 +22,74 @@ module Zint
     typedef :pointer, :source
 
     # Create and initialize a symbol structure
-    attach_function(:ZBarcode_Create, [], :zint_symbol)
+    attach_function(:ZBarcode_Create, [], :zint_symbol, blocking: true)
 
     # Free any output buffers that may have been created and initialize output fields
-    attach_function(:ZBarcode_Clear, [:zint_symbol], :void)
+    attach_function(:ZBarcode_Clear, [:zint_symbol], :void, blocking: true)
 
     # Free a symbol structure, including any output buffers
     #
     # For use with ruby's garbage collector ZBarcode_Delete must be called with a plain :pointer and not an :zint_symbol.
-    attach_function(:ZBarcode_Delete, [:pointer], :void)
+    attach_function(:ZBarcode_Delete, [:pointer], :void, blocking: true)
 
     # Encode a barcode. If `length` is 0, `source` must be NUL-terminated.
-    attach_function(:ZBarcode_Encode, [:zint_symbol, :source, :length], :error_code)
+    attach_function(:ZBarcode_Encode, [:zint_symbol, :source, :length], :error_code, blocking: true)
 
     # Encode a barcode using input data from file `filename`
-    attach_function(:ZBarcode_Encode_File, [:zint_symbol, :filename], :error_code)
+    attach_function(:ZBarcode_Encode_File, [:zint_symbol, :filename], :error_code, blocking: true)
 
     # Output a previously encoded symbol to file `symbol->outfile`
-    attach_function(:ZBarcode_Print, [:zint_symbol, :rotate_angle], :error_code)
+    attach_function(:ZBarcode_Print, [:zint_symbol, :rotate_angle], :error_code, blocking: true)
 
     # Encode and output a symbol to file `symbol->outfile`
-    attach_function(:ZBarcode_Encode_and_Print, [:zint_symbol, :source, :length, :rotate_angle], :error_code)
+    attach_function(:ZBarcode_Encode_and_Print, [:zint_symbol, :source, :length, :rotate_angle], :error_code, blocking: true)
 
     # Encode a symbol using input data from file `filename` and output to file `symbol->outfile`
-    attach_function(:ZBarcode_Encode_File_and_Print, [:zint_symbol, :filename, :rotate_angle], :error_code)
+    attach_function(:ZBarcode_Encode_File_and_Print, [:zint_symbol, :filename, :rotate_angle], :error_code, blocking: true)
 
     # Output a previously encoded symbol to memory as raster (`symbol->bitmap`)
-    attach_function(:ZBarcode_Buffer, [:zint_symbol, :rotate_angle], :error_code)
+    attach_function(:ZBarcode_Buffer, [:zint_symbol, :rotate_angle], :error_code, blocking: true)
 
     # Encode and output a symbol to memory as raster (`symbol->bitmap`)
-    attach_function(:ZBarcode_Encode_and_Buffer, [:zint_symbol, :source, :length, :rotate_angle], :error_code)
+    attach_function(:ZBarcode_Encode_and_Buffer, [:zint_symbol, :source, :length, :rotate_angle], :error_code, blocking: true)
 
     # Encode a symbol using input data from file `filename` and output to memory as raster (`symbol->bitmap`)
-    attach_function(:ZBarcode_Encode_File_and_Buffer, [:zint_symbol, :filename, :rotate_angle], :error_code)
+    attach_function(:ZBarcode_Encode_File_and_Buffer, [:zint_symbol, :filename, :rotate_angle], :error_code, blocking: true)
 
     # Output a previously encoded symbol to memory as vector (`symbol->vector`)
-    attach_function(:ZBarcode_Buffer_Vector, [:zint_symbol, :rotate_angle], :error_code)
+    attach_function(:ZBarcode_Buffer_Vector, [:zint_symbol, :rotate_angle], :error_code, blocking: true)
 
     # Encode and output a symbol to memory as vector (`symbol->vector`)
-    attach_function(:ZBarcode_Encode_and_Buffer_Vector, [:zint_symbol, :source, :length, :rotate_angle], :error_code)
+    attach_function(:ZBarcode_Encode_and_Buffer_Vector, [:zint_symbol, :source, :length, :rotate_angle], :error_code, blocking: true)
 
     # Encode a symbol using input data from file `filename` and output to memory as vector (`symbol->vector`)
-    attach_function(:ZBarcode_Encode_File_and_Buffer_Vector, [:zint_symbol, :filename, :rotate_angle], :error_code)
+    attach_function(:ZBarcode_Encode_File_and_Buffer_Vector, [:zint_symbol, :filename, :rotate_angle], :error_code, blocking: true)
+
+    # ********* Segment support *********
+    # int ZBarcode_Encode_Segs(struct zint_symbol *symbol,
+    #       const struct zint_seg segs[], const int seg_count);
+    attach_function(:ZBarcode_Encode_Segs, [:zint_symbol, :pointer, :int], :error_code, blocking: true)
+
+    # int ZBarcode_Encode_Segs_and_Print(struct zint_symbol *symbol,
+    #       const struct zint_seg segs[], const int seg_count, int rotate_angle);
+    attach_function(:ZBarcode_Encode_Segs_and_Print, [:zint_symbol, :pointer, :int, :rotate_angle], :error_code, blocking: true)
+
+    # int ZBarcode_Encode_Segs_and_Buffer(struct zint_symbol *symbol,
+    #       const struct zint_seg segs[], const int seg_count, int rotate_angle);
+    attach_function(:ZBarcode_Encode_Segs_and_Buffer, [:zint_symbol, :pointer, :int, :rotate_angle], :error_code, blocking: true)
+
+    # int ZBarcode_Encode_Segs_and_Buffer_Vector(struct zint_symbol *symbol,
+    #       const struct zint_seg segs[], const int seg_count, int rotate_angle);
+    attach_function(:ZBarcode_Encode_Segs_and_Buffer_Vector, [:zint_symbol, :pointer, :int, :rotate_angle], :error_code, blocking: true)
 
     # Is `symbol_id` a recognized symbology?
-    attach_function(:ZBarcode_ValidID, [:symbol_id], :bool)
+    attach_function(:ZBarcode_ValidID, [:symbol_id], :bool, blocking: true)
 
     # Return the capability flags for symbology `symbol_id` that match `cap_flag`
-    attach_function(:ZBarcode_Cap, [:symbol_id, :cap_flag], :uint32)
+    attach_function(:ZBarcode_Cap, [:symbol_id, :cap_flag], :uint32, blocking: true)
 
     # Return the version of Zint linked to
-    attach_function(:ZBarcode_Version, [], :int32)
+    attach_function(:ZBarcode_Version, [], :int32, blocking: true)
 
     # Raises specific error for API return code
     #

data/lib/zint/structs/seg.rb

@@ -0,0 +1,26 @@
+module Zint
+  module Structs
+    class Seg < FFI::Struct
+      # /* Segment for use with `raw_segs` and API `ZBarcode_Encode_Segs()` */
+      # struct zint_seg {
+      #     unsigned char *source; /* Data to encode, or (`raw_segs`) data encoded */
+      #     int length;         /* Length of `source`. If 0 or negative, `source` must be NUL-terminated */
+      #     int eci;            /* Extended Channel Interpretation */
+      # };
+
+      layout :source, :pointer, # Data to encode, or (`raw_segs`) data encoded
+        :length, :int, # Length of `source`. If 0 or negative, `source` must be NUL-terminated
+        :eci, :int # Extended Channel Interpretation
+
+      # Data to encode, or (`raw_segs`) data encoded
+      def source
+        self[:source].read_bytes(self[:length])
+      end
+
+      # Extended Channel Interpretation
+      def eci
+        self[:eci]
+      end
+    end
+  end
+end

data/lib/zint/structs/symbol.rb

@@ -8,8 +8,8 @@ module Zint
         :whitespace_height, :int, # Height in X-dimensions of whitespace above & below the barcode
         :border_width, :int, # Size of border in X-dimensions
         :output_options, :int, # Various output parameters (bind, box etc, see below)
-        :fgcolour, [:char, 10], # Foreground as RGB/RGBA hexadecimal string, 6 or 8 characters, NUL-terminated
-        :bgcolour, [:char, 10], # Background as RGB/RGBA hexadecimal string, 6 or 8 characters, NUL-terminated
+        :fgcolour, [:char, 16], # Foreground as RGB/RGBA hexadecimal string, 6 or 8 characters, NUL-terminated
+        :bgcolour, [:char, 16], # Background as RGB/RGBA hexadecimal string, 6 or 8 characters, NUL-terminated
         :fgcolor, :pointer, # Pointer to fgcolour (alternate spelling)
         :bgcolor, :pointer, # Pointer to bgcolour (alternate spelling)
         :outfile, [:char, 256], # Name of file to output to, NUL-terminated. Default "out.png" ("out.gif" if NO_PNG)
@@ -18,16 +18,17 @@ module Zint
         :option_2, :int, # Symbol-specific options
         :option_3, :int, # Symbol-specific options
         :show_hrt, :int, # Show (1) or hide (0) Human Readable Text (HRT). Default 1
-        :fontsize, :int, # Unused
         :input_mode, :int, # Encoding of input data (see DATA_MODE etc below). Default DATA_MODE
         :eci, :int, # Extended Channel Interpretation. Default 0 (none)
         :dpmm, :float, # Resolution of output in dots per mm (BMP/EMF/PCX/PNG/TIF only). Default 0 (none)
         :dot_size, :float, # Size of dots used in BARCODE_DOTTY_MODE. Default 0.8
+        :text_gap, :float, # float text_gap;     /* Gap between barcode and text (HRT) in X-dimensions. Default 1 */
         :guard_descent, :float, # Height in X-dimensions that EAN/UPC guard bars descend. Default 5
         :structapp, Structapp, # Structured Append info. Default structapp.count 0 (none)
         :warn_level, :int, # Affects error/warning value returned by Zint API (see WARN_XXX below)
         :debug, :int, # Debugging flags
-        :text, [:uchar, 128], # Human Readable Text (if any), UTF-8, NUL-terminated (output only)
+        :text, [:uchar, 256], # Human Readable Text (if any), UTF-8, NUL-terminated (output only)
+        :text_length, :int, # int text_length;    /* Length of text in bytes (output only) */
         :rows, :int, # Number of rows used by the symbol (output only)
         :width, :int, # Width of the generated symbol (output only)
         :encoded_data, [:uchar, 200 * 144], # Encoded data (output only). Allows for rows of 1152 modules
@@ -37,8 +38,15 @@ module Zint
         :bitmap_width, :int, # Width of bitmap image (raster output only)
         :bitmap_height, :int, # Height of bitmap image (raster output only)
         :alphamap, :pointer, # Array of alpha values used (raster output only)
-        :bitmap_byte_length, :uchar, # Size of BMP bitmap data (raster output only)
-        :vector, Vector.by_ref # Pointer to vector header (vector output only)
+        :vector, Vector.by_ref, # Pointer to vector header (vector output only)
+        :memfile, :pointer, # unsigned char *memfile; /* Pointer to in-memory file buffer if BARCODE_MEMORY_FILE (output only) */
+        :memfile_size, :int # int memfile_size;   /* Length of in-memory file buffer (output only) */
+
+      # Upcomming zint-2.16:
+      # struct zint_seg *raw_segs; /* Pointer to array of raw segs if BARCODE_RAW_TEXT (output only) */
+      # :raw_segs, Seg.by_ref,
+      # int raw_seg_count;  /* Number of `raw_segs` (output only) */
+      # :raw_seg_count, :int
 
       # @private
       def self.release(ptr)

data/lib/zint/version.rb

@@ -1,3 +1,3 @@
 module Zint
-  VERSION = "1.4.0"
+  VERSION = "1.5.0"
 end

data/lib/zint/zint_recipe.rb

@@ -8,14 +8,18 @@ module Zint
   class ZintRecipe < MiniPortileCMake
     ROOT = File.expand_path("../../..", __FILE__)
 
-    def initialize
-      super("libzint", ZINT_VERSION)
+    def initialize(name, vers, url, sha1)
+      super(name, vers)
       self.target = File.join(ROOT, "ports")
-      self.files = [url: ZINT_SOURCE_URI, sha1: ZINT_SOURCE_SHA1]
+      self.files = [url: url, sha1: sha1]
+    end
+
+    def port_path
+      "#{target}/#{RUBY_PLATFORM}"
     end
 
     def cook_and_activate
-      checkpoint = File.join(target, "#{name}-#{version}-#{host}.installed")
+      checkpoint = File.join(target, "#{name}-#{version}-#{RUBY_PLATFORM}.installed")
       unless File.exist?(checkpoint)
         cook
         FileUtils.touch checkpoint

data/lib/zint.rb

@@ -20,6 +20,7 @@ require "zint/structs/vector_hexagon"
 require "zint/structs/vector_rect"
 require "zint/structs/vector_string"
 require "zint/structs/vector"
+require "zint/structs/seg"
 require "zint/structs/structapp"
 require "zint/structs/symbol"
 require "zint/native"
@@ -82,6 +83,7 @@ module Zint
   autoload :Dpd, "zint/dpd"
   autoload :Dpident, "zint/dpident"
   autoload :Dpleit, "zint/dpleit"
+  autoload :Dxfilmedge, "zint/dxfilmedge"
   autoload :Ean128, "zint/ean128"
   autoload :Ean14, "zint/ean14"
   autoload :Eanx, "zint/eanx"

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: ruby-zint
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Elias Fröhner
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-08 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -38,7 +37,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
-description:
 email:
 - apiwalker96@gmail.com
 executables: []
@@ -90,6 +88,7 @@ extra_rdoc_files:
 - lib/zint/dpd.rb
 - lib/zint/dpident.rb
 - lib/zint/dpleit.rb
+- lib/zint/dxfilmedge.rb
 - lib/zint/ean128.rb
 - lib/zint/ean14.rb
 - lib/zint/eanx.rb
@@ -155,13 +154,9 @@ extra_rdoc_files:
 - lib/zint/vin.rb
 - lib/zint/zint_recipe.rb
 files:
-- ".rspec"
-- ".standard.yml"
 - ".yardopts"
-- Gemfile
 - LICENSE.txt
 - README.md
-- Rakefile
 - ext/ruby-zint/extconf.rb
 - lib/ruby-zint.rb
 - lib/zint.rb
@@ -217,6 +212,7 @@ files:
 - lib/zint/dpd.rb
 - lib/zint/dpident.rb
 - lib/zint/dpleit.rb
+- lib/zint/dxfilmedge.rb
 - lib/zint/ean128.rb
 - lib/zint/ean14.rb
 - lib/zint/eanx.rb
@@ -268,6 +264,7 @@ files:
 - lib/zint/rssexp.rb
 - lib/zint/rssexpstack.rb
 - lib/zint/rssltd.rb
+- lib/zint/structs/seg.rb
 - lib/zint/structs/structapp.rb
 - lib/zint/structs/symbol.rb
 - lib/zint/structs/vector.rb
@@ -288,16 +285,17 @@ files:
 - lib/zint/version.rb
 - lib/zint/vin.rb
 - lib/zint/zint_recipe.rb
-- ports/archives/zint-2.12.0-src.tar.gz
-homepage: https://github.com/api-walker/ruby-zint
+- ports/archives/libpng-1.6.50.tar.xz
+- ports/archives/zint-2.15.0-src.tar.gz
+- ports/archives/zlib-1.3.1.tar.gz
+homepage: https://github.com/eliasfroehner/ruby-zint
 licenses:
 - MIT
 metadata:
-  homepage_uri: https://github.com/api-walker/ruby-zint
-  source_code_uri: https://github.com/api-walker/ruby-zint
+  homepage_uri: https://github.com/eliasfroehner/ruby-zint
+  source_code_uri: https://github.com/eliasfroehner/ruby-zint
   msys2_mingw_dependencies: cmake libpng
   documentation_uri: https://rubydoc.info/gems/ruby-zint
-post_install_message:
 rdoc_options:
 - "--main"
 - README.md
@@ -318,8 +316,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.9
-signing_key:
+rubygems_version: 3.7.0
 specification_version: 4
 summary: Ruby FFI binding for libzint
 test_files: []

data/.rspec

@@ -1,3 +0,0 @@
---format documentation
---color
---require spec_helper

data/.standard.yml

@@ -1,5 +0,0 @@
-parallel: true
-format: progress
-ruby_version: 2.6
-ignore:
-  - 'ext/ruby-zint/tmp/**/*'

data/Gemfile

@@ -1,20 +0,0 @@
-source "https://rubygems.org"
-
-# Specify your gem's dependencies in ruby-zint.gemspec
-gemspec
-
-gem "rake", "~> 13.0"
-
-gem "rspec", "~> 3.0"
-
-gem "simplecov", require: false
-
-gem "chunky_png"
-
-gem "byebug"
-
-gem "standard", "~> 1.3"
-
-gem "mini_portile2"
-
-gem "yard"

data/Rakefile

@@ -1,23 +0,0 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
-require_relative "lib/zint/zint_recipe"
-
-CLOBBER.include "pkg"
-CLOBBER.add("ports/*").exclude(%r{ports/archives$})
-CLEAN.include "tmp"
-CLEAN.include "ext/ruby-zint/tmp"
-CLEAN.include "lib/*.a"
-CLEAN.include "lib/*.so*"
-CLEAN.include "lib/*.dll*"
-
-RSpec::Core::RakeTask.new(:spec)
-
-require "standard/rake"
-
-task default: %i[spec standard]
-
-task gem: :build
-task :compile do
-  sh "ruby -C ext/ruby-zint extconf.rb --disable-system-libzint"
-  sh "make -C ext/ruby-zint install RUBYARCHDIR=../../lib"
-end