escpos-image 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 494847e3b67b9e87fec165e48507d7050a779aa36ff440a22b874233cbfd72e8
-  data.tar.gz: 9aadde3e6581ebc836420220e0b33949e71fafe97328786d1d7819f9e8488d59
+  metadata.gz: 3027cc8f6b64944bf51ab301eb078f8261afee063dc2cb1da644a1b84d5a016a
+  data.tar.gz: 84cd2ce46feb585bd67f7d042bfeab6c5349740e5f568dc49106b2b15fa8832e
 SHA512:
-  metadata.gz: 462c890880ca0ecb3a870d99c90525996d70ba8b748bfe80a00bc3c37233deea5567716e90bc957d1048308108f12359d410f3b45528e6285769639756d054f1
-  data.tar.gz: c6f7c07aa8886ded1887859970de46b38c71f0c6df60e4f6b82f7c803a1133e9e672547a8700759645367245081c2b09b015f2430cb39a80257a205f26cea016
+  metadata.gz: d615849b9b58d2459cd917850ab08bc0e1f06f0065df04bce8ed8dd25f3df3995f36fc98d5b273a95038d3fe4a6d09ea032926d3bd7f66c3cf206ea539af1b35
+  data.tar.gz: bf4931809d7edfdb3a61f7c9e5325313a72b5d3583a10644956f1445dfac8cdef77281057bf3a6b3ec565b49b43ffe0b41a752709f13d56ea003c54f9f49adf5

data/lib/escpos/image.rb

@@ -1,7 +1,7 @@
 module Escpos
   class Image
 
-    VERSION = "0.0.5"
+    VERSION = "0.0.6"
 
     attr_reader :options
 
@@ -35,13 +35,15 @@ module Escpos
       0.upto(@image.height - 1) do |y|
         0.upto(@image.width - 1) do |x|
           px = ChunkyPNG::Color.to_grayscale(@image.get_pixel(x, y))
-          r, g, b =
+          r, g, b, a =
             ChunkyPNG::Color.r(px),
             ChunkyPNG::Color.g(px),
-            ChunkyPNG::Color.b(px)
+            ChunkyPNG::Color.b(px),
+            ChunkyPNG::Color.a(px)
           px = (r + b + g) / 3
           # Alpha is flattened with convert_to_monochrome option
-          if options.fetch(:compose_alpha, false)
+          handled_by_mini_magick = options.fetch(:convert_to_monochrome, false)
+          if !handled_by_mini_magick && options.fetch(:compose_alpha, true)
             bg_color = options.fetch(:compose_alpha_bg, 255)
             a_quot = a / 255.0
             px = (((1 - a_quot) * bg_color) + (a_quot * px)).to_i

data/test/lib/escpos/image_test.rb

@@ -12,6 +12,7 @@ class ImageTest < Minitest::Test
     @printer.write image.to_escpos
     @printer.write "\n" * 10
     @printer.cut!
+    image.chunky_png_image.metadata = {}
     image.chunky_png_image.save(File.join(__dir__, "../../results/#{__method__}.png"))
     assert_equal @printer.to_base64, 'G0AddjAAEACYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//gAAAAAAAAAAAAAAAAAD///AAAAAAAAAAAAAAAAAD///8AAAAAAAAAAAAAAAAD////gAAAAAAAAAAAAAAAB////+AAAAAAAAAAAAAAAA/////wAAAAAAAAAAAAAAAf////+AAAAAAAAAAAAAAAP/////gAAAAAAAAAAAAAAH/////8AAAAAAAAAAAAAAB//////gAAAAAAAAAAAAAA//////4AAAAAAAAAAAAAAP//////AAAAAAAAAAAAAAH//////wAAAAAAAAAAAAAB//////8AAAAAAAAAAAAAAf//////gAAAAAAAAAAAAAP//////4AAAAAAAAAAAAAD//////+AAAAAAAAAAAAAA///////gAAAAAAAAAAAAAP//////8AAAAAAAAAAAAAD///////AAAAAAAAAAAAAA////D//wAAAAAAAAAAAAAP///AP/8AAAAAAAAAAAAAH4P/gB//AAAAAAAAAAAAAB8B/wAf/wAAAAAAAAAAAAAfAP8AD/8AAAAAAAAAAAAAHgD+AA//AAAAAAAAAAAAAB4AfgwH/4AAAAAAAAAAAAAeEHweB/+AAAAAAAAAAAAAHjh8Hwf/gAAAAAAAAAAAAA48fD8H/4AAAAAAAAAAAAAOfHw/B/+AAAAAAAAAAAAADnx+Pwf/gAAAAAAAAAAAAA5/w/8H/4AAAAAAAAAAAAAOPgB/B/+AAAAAAAAAAAAADjwAHw//gAAAAAAAAAAAAA8YAAcP/4AAAAAAAAAAAAAPsAAB//+AAAAAAAAAAAAAD8AAAD//gAAAAAAAAAAAAA+AAAAP/4AAAAAAAAAAAAAPAAAAB/+AAAAAAAAAAAAADgAAAAf/gAAAAAAAAAAAAAwAAADH/4AAAAAAAAAAAAAMwAADh/+AAAAAAAAAAAAAHmAABgf/gAAAAAAAAAAAAB4wABgP/4AAAAAAAAAAAAAfDABgH//AAAAAAAAAAAAAH4cBgDP/wAAAAAAAAAAAAB/g/gDD/+AAAAAAAAAAAAA/MAADA//gAAAAAAAAAAAAPwgADAH/8AAAAAAAAAAAAD8EADAB//AAAAAAAAAAAAB/AwBgAf/4AAAAAAAAAAAAfwDDgAD/+AAAAAAAAAAAAP4AAAAA//wAAAAAAAAAAAD+AAAAAP/+AAAAAAAAAAAB/gAAAAB//gAAAAAAAAAAAf4AAAAAf/8AAAAAAAAAAAP8AAAAAH//gAAAAAAAAAAH/AAAAAA//8AAAAAAAAAAD/wAAAAAP//gAAAAAAAAAA/4AAAAAB//4AAAAAAAAAAf+AAAAAAf//AAAAAAAAAAP/gAAAAAH//4AAAAAAAAAH/wAAAAAA///AAAAAAAAAD/8AAAAAAP//4AAAAAAAAA//AAAAAAB//+AAAAAAAAAf/gAAAAAAff/wAAAAAAAAP/4AAAAAAH7/+AAAAAAAAD/8AAAAAAA/f/gAAAAAAAB//AAAAAAAP7/8AAAAAAAA/vgAAAAAAB/f/gAAAAAAAP34AAAAAAAfz/4AAAAAAAH98AAAAAAAD+//AAAAAAAB+/AAAAAAAA/3/wAAAAAAA/vwAAAAAAAH8/+AAAAAAAP34AAAAAAAB/v/gAAAAAAH9+AAAAAAAAP5/8AAAAAAD+/AAAAAAAAD+f/AAAAAAA/vwAAAAAAAAfz/4AAAAAAfz4AAAAAAAAH8/+AAAAAAH9+AAAAAAAAA/P/wAAAAAB+fAAAAAAAAAP5/8AAAAAA/nwAAAAAAAAD+f/AAAAAAP78AAAAAAAAAfn/4AAAAAH8+AAAAAAAAAH5/+AAAAAB/PgAAAAAAAAB+f/gAAAAAfz4AAAAAAAAAPj/4AAAAAP88AAAAAAAAAD4//AAAAAD/PAAAAAAAAAA+P/wAAAAA/jwAAAAAAAAAHj/8AAAAAP48AAAAAAAAABw//AAAAAH+PAAAAAAAAAAMf/wAAAAB/zgAAAAAAAAAAH/8AAAAAf8YAAAAAAAAAAA//AAAAAH/GAAAAAAAAAA8D/wAAAAB/wgAAAAAAAAA54P8AAAAAf+IAAAAAAAAAIDx/AAAAAH/gAAAAAAAAAGAOPwAAAAB/8AAAAAAAAABAB58AAAAAf/AAAAAAAAAAwAPPAAAAAH/4AAAAAAAAAcADzwAAAAB//AAAAAAAAAfAAc4AAAAA4H4AAAAAAAAGYAPuAAAAAcAfAAAAAAAADGAD/gAAAAGAD8AAAAAAAAxgB/8AAAADAA/gAAAAAAAYMB+DwAAABgAH+AAAAAAAGDx/AMAAAA4AA/wAAAAAABgf/gBgAAAcAAH/AAAAAAAwD/gAYAAAeAAB/4AAAAAAMAfgADAAA+AAAP/AAAAAADAAAAAwAA+AAAD/4AAAAAAwAAAAMAAcAAAAf/AAAAAAMAAAABAAOAAAAH/4AAAAADAAAAAYADAAAAA/+AAAAAAwAAAAGABgAAAAP/wAAAAAIAAAABgAYAAAAB/8AAAAAGAAAAAMAGAAAAAf/gAAAABgAAAADABgAAAAD/4AAAAAYAAAAAYAYAAAAA/+AAAAAGAAAAADAGAAAAAH/gAAAABgAAAAA4BgAAAAA/wAAAAAYAAAAAGAYAAAAAH4AAAAAGAAAAAAwDAAAAAB4AAAAADgAAAAAMAwAAAAAOAAAAAAwAAAAABgMAAAAABgAAAAAMAAAAAAYDAAAAAAMAAAAADAAAAAAGBgAAAAABgAAAABgAAAAADgYAAAAAAcAAAAA4AAAAAAwGAAAAAADAAAAA+AAAAAA4BgAAAAAAcAAAA/gAAAAAcAwAAAAAAHwAAA/wAAAAAcAMAAAAAAA/AAB/8AAAAAcADAAAAAAAP/AH//AAAAAcAAwAAAAAAD/////wAAAAcAAOAAAAAAAf////8AAAAcAABgAAAAAAH////+AAAAOAAAMAAAAAAB/////gAAAGAAAB8AAAAAA/////4AAADAAAAH/wAAAAP/gAf/AAABgAAAAH/4AAAD4AAAAwAAAwAAAAAAfgAABgAAAAMAAAYAAAAAAAeAAA4AAAABgAAMAAAAAAAB8AAcAAAAAcAAOAAAAAAAAH4AeAAAAADAAHAAAAAAAAAP/+AAAAAAcAHgAAAAAAAAAf+AAAAAADwPgAAAAAAAAAAAAAAAAAAf/gAAAAAAAAAAAAAAAAAAA/AAAAAAAAAAAAAAAAAAAAAAAAAAACgoKCgoKCgoKCh1WAA=='
   end
@@ -23,6 +24,7 @@ class ImageTest < Minitest::Test
     @printer.write image.to_escpos
     @printer.write "\n" * 10
     @printer.cut!
+    image.chunky_png_image.metadata = {}
     image.chunky_png_image.save(File.join(__dir__, "../../results/#{__method__}.png"))
     assert_equal @printer.to_base64, 'G0AddjAAEACYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAASAAAAAAAAAAAAAAAAAAAF/+gAAAAAAAAAAAAAAAAAP//+AAAAAAAAAAAAAAAAAP///wAAAAAAAAAAAAAAAAH////AAAAAAAAAAAAAAAAH////4AAAAAAAAAAAAAAAD/////AAAAAAAAAAAAAAAB/////4AAAAAAAAAAAAAAAf/////AAAAAAAAAAAAAAAP/////wAAAAAAAAAAAAAAH/////+AAAAAAAAAAAAAAB//////gAAAAAAAAAAAAAA//////8AAAAAAAAAAAAAAP//////AAAAAAAAAAAAAAD//////4AAAAAAAAAAAAAB//////+AAAAAAAAAAAAAAf//////gAAAAAAAAAAAAAH//////4AAAAAAAAAAAAAB///////AAAAAAAAAAAAAAf//////wAAAAAAAAAAAAAP//////8AAAAAAAAAAAAAB///8H//AAAAAAAAAAAAAA/r/8A//wAAAAAAAAAAAAAHwf+AH/8AAAAAAAAAAAAAD4D/gA//gAAAAAAAAAAAAA8AfwAP/wAAAAAAAAAAAAAHAH8EB/+AAAAAAAAAAAAADwh+Hwf/AAAAAAAAAAAAAA4cPh8H/4AAAAAAAAAAAAAHPD4fg/+AAAAAAAAAAAAADj4+P4f/AAAAAAAAAAAAAAc+fz+H/4AAAAAAAAAAAAAPPvW/h/8AAAAAAAAAAAAABx8Afwf/gAAAAAAAAAAAAAeeAB8P/wAAAAAAAAAAAAAHnAAHj/+AAAAAAAAAAAAAB9AAAN//AAAAAAAAAAAAAAfgAAA//4AAAAAAAAAAAAAHwAAAD/8AAAAAAAAAAAAAB4AAAAf/gAAAAAAAAAAAAAcAAAAH/4AAAAAAAAAAAAAOQAAA4/+AAAAAAAAAAAAABmAAA4f/gAAAAAAAAAAAAA8wAAYH/4AAAAAAAAAAAAAPCAAYD//AAAAAAAAAAAAAD44AcBv/wAAAAAAAAAAAAA/ho8Az/8AAAAAAAAAAAAAf4PwBw//gAAAAAAAAAAAAH5wABwP/4AAAAAAAAAAAAB+EAAwB//AAAAAAAAAAAAA/gwAwAf/wAAAAAAAAAAAAP4GBwAH/+AAAAAAAAAAAAD8AfwAA//wAAAAAAAAAAAB/gAAAAP/8AAAAAAAAAAAA/wAAAAB//gAAAAAAAAAAAP8AAAAAf/8AAAAAAAAAAAH+AAAAAH//gAAAAAAAAAAD/gAAAAA//4AAAAAAAAAAA/4AAAAAP//AAAAAAAAAAAf+AAAAAD//4AAAAAAAAAAP/AAAAAAf//AAAAAAAAAAH/wAAAAAH//4AAAAAAAAAB/4AAAAAA//+AAAAAAAAAA/+AAAAAAP//wAAAAAAAAAf/gAAAAAD//+AAAAAAAAAP/wAAAAAAff/wAAAAAAAAD/8AAAAAAH7/8AAAAAAAAB/+AAAAAAA/f/gAAAAAAAA//gAAAAAAP7/8AAAAAAAAP34AAAAAAB/f/AAAAAAAAH78AAAAAAAf3/4AAAAAAAD+/AAAAAAAD+/+AAAAAAAA/fgAAAAAAA/3/wAAAAAAAf34AAAAAAAH9/+AAAAAAAH78AAAAAAAB/v/gAAAAAAD+/AAAAAAAAP7/8AAAAAAA/fgAAAAAAAD/f/AAAAAAAf34AAAAAAAAf3/wAAAAAAH78AAAAAAAAH8/+AAAAAAD+/AAAAAAAAB/f/gAAAAAA/vwAAAAAAAAP7/8AAAAAAf34AAAAAAAAD+//AAAAAAH8+AAAAAAAAAfn/wAAAAAD/fAAAAAAAAAH5/+AAAAAA/3wAAAAAAAAB+f/gAAAAAP58AAAAAAAAAPn/4AAAAAD+fAAAAAAAAAD5/+AAAAAB/ngAAAAAAAAA+f/wAAAAAf54AAAAAAAAAPH/4AAAAAH+eAAAAAAAAABx//AAAAAD/jgAAAAAAAAAE//wAAAAAf94AAAAAAAAAAH/8AAAAAP+MAAAAAAAAADQf/AAAAAD/zgAAAAAAAAD/j/wAAAAA/8QAAAAAAAAAw+P8AAAAAP/AAAAAAAAAAQD5+AAAAAD/4AAAAAAAAAGAPPwAAAAA//AAAAAAAAADAB54AAAAAP/wAAAAAAAABwAPeAAAAAD/+AAAAAAAAB8AD3gAAAAA4PwAAAAAAAAZgB94AAAAAcB/AAAAAAAAMYAf8AAAAAOAH4AAAAAAADGAP/wAAAAHAB/gAAAAAABgwH6+AAAABgAP8AAAAAAAYPH8BwAAAAwAB/gAAAAAAOB/8AMAAAA8AAP+AAAAAADAf+ABgAAA8AAD/wAAAAAAwB+AAYAAA+AAAf+AAAAAAMAAAAGAAA8AAAH/wAAAAADAAAAAwAAcAAAA/+AAAAAAwAAAAMAAOAAAAP/gAAAAAMAAAADAAHAAAAB/8AAAAAGAAAAAwABgAAAAf/gAAAAAwAAAAGAAYAAAAD/4AAAAAYAAAABgAGAAAAA//AAAAADAAAAAcABgAAAAH/wAAAABgAAAADgAYAAAAA/8AAAAAYAAAAAYAGAAAAAP/AAAAAGAAAAADABgAAAAB/gAAAABgAAAAA4AMAAAAAPwAAAAAYAAAAAGAGAAAAABwAAAAAMAAAAAAwAwAAAAAcAAAAADAAAAAAMAYAAAAADgAAAAAwAAAAADADAAAAAAYAAAAAcAAAAAAwBgAAAAADAAAAAOAAAAAAYAYAAAAAA4AAAAHgAAAAAOAOAAAAAAHAAAAH4AAAAAPABAAAAAAA8AAAH8AAAAAHgAwAAAAAAPwAAP/AAAAAPgAMAAAAAAB/wAf/wAAAAHgADAAAAAAAf////8AAAAPgAAwAAAAAAH/////AAAAHgAAGAAAAAAA/////gAAAHgAABwAAAAAAf////8AAADgAAAPgAAAAAH/////AAABwAAAA/+AAAAB/+pf/gAAA4AAAAC//AAAAfoAAK8AAAcAAAAAAH+AAAOAAAADAAAGAAAAAAAH4AAHAAAAAYAAHAAAAAAAAHgADgAAAAHAADgAAAAAAAA/ADwAAAAAwABwAAAAAAAAB/vwAAAAAHAB4AAAAAAAAAH/wAAAAAA8D4AAAAAAAAAABAAAAAAAH/4AAAAAAAAAAAAAAAAAAAPwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACgoKCgoKCgoKCh1WAA=='
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: escpos-image
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Jan Svoboda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-20 00:00:00.000000000 Z
+date: 2019-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler