hexapdf 0.15.0 → 0.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bcd3bc77b70872416b1377b4fdf97804de083cf4d7213dfd200738fd8b2adae7
-  data.tar.gz: 53a8a850610a744570999cf56c656d6bd65c8ab691a5658b81172111bdd44804
+  metadata.gz: 310d9fc74134cb2840118b3637c35a3037909d707532116680ef2fe6f42c43d3
+  data.tar.gz: 76f05b220e101114d4a4136d8c07520cfe35e1e532652ea4e43593a4b812284c
 SHA512:
-  metadata.gz: 54c99dbd44c4ae146496912f295982d47bb5ca297d4d2b76475c1f3151670068cd3be0c2dedee413b0a52e493383229bbd36d819ff2db2a9c04b377731cc107e
-  data.tar.gz: 8426e942709633b921f7a644e01b645d555cfcdecbdbd25bae03d0154cf07df3a3cd1f108adb16a8b449801c203014698a6b382133bbb63033a1d590351b61f7
+  metadata.gz: 6e811e637b859f3e327ece6af28174bd6602cec0585af596c9b174127ab7276752c3e519e668757933945f2906f4a6856a96e68575eb9139f32365bfa6b8a36b
+  data.tar.gz: 54e94c7d6704a340d1e5a5ad7b35e0715b06b6604ecec4671a079cea6049f786308258a44378280597d59e66c17e4eefd6317e94fe9a465671c2d093a7395ad3

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 0.15.1 - 2021-04-15
+
+### Fixed
+
+* Potential division by zero when calculating the scaling for XObjects
+* Handling of XObjects with a width or height of zero when drawing on canvas
+
+
 ## 0.15.0 - 2021-04-12
 
 ### Added

data/lib/hexapdf/content/canvas.rb

@@ -1260,6 +1260,7 @@ module HexaPDF
         unless obj.kind_of?(HexaPDF::Stream)
           obj = context.document.images.add(obj)
         end
+        return obj if obj.width == 0 || obj.height == 0
 
         width, height = calculate_dimensions(obj.width, obj.height,
                                              rwidth: width, rheight: height)

data/lib/hexapdf/utils/graphics_helpers.rb

@@ -47,18 +47,18 @@ module HexaPDF
       #
       # +rwidth+::
       #     The requested width. If +rheight+ is not specified, it is chosen so that the aspect
-      #     ratio is maintained
+      #     ratio is maintained. In case of +width+ begin zero, +height+ is used for the height.
       #
       # +rheight+::
       #     The requested height. If +rwidth+ is not specified, it is chosen so that the aspect
-      #     ratio is maintained
+      #     ratio is maintained. In case of +height+ begin zero, +width+ is used for the width.
       def calculate_dimensions(width, height, rwidth: nil, rheight: nil)
         if rwidth && rheight
           [rwidth, rheight]
         elsif rwidth
-          [rwidth, height * rwidth / width.to_f]
+          [rwidth, width == 0 ? height : height * rwidth / width.to_f]
         elsif rheight
-          [width * rheight / height.to_f, rheight]
+          [height == 0 ? width : width * rheight / height.to_f, rheight]
         else
           [width, height]
         end

data/lib/hexapdf/version.rb

@@ -37,6 +37,6 @@
 module HexaPDF
 
   # The version of HexaPDF.
-  VERSION = '0.15.0'
+  VERSION = '0.15.1'
 
 end

data/test/hexapdf/content/test_canvas.rb

@@ -831,6 +831,17 @@ describe HexaPDF::Content::Canvas do
                                         [:restore_graphics_state]])
     end
 
+    it "doesn't do anything if the image's width or height is zero" do
+      @image[:Width] = 0
+      @canvas.xobject(@image, at: [0, 0])
+      assert_operators(@page.contents, [])
+
+      @image[:Width] = 10
+      @image[:Height] = 0
+      @canvas.xobject(@image, at: [0, 0])
+      assert_operators(@page.contents, [])
+    end
+
     it "correctly serializes the form with no options" do
       @canvas.xobject(@form, at: [1, 2])
       assert_operators(@page.contents, [[:save_graphics_state],
@@ -862,6 +873,16 @@ describe HexaPDF::Content::Canvas do
                                         [:paint_xobject, [:XO1]],
                                         [:restore_graphics_state]])
     end
+
+    it "doesn't do anything if the form's width or height is zero" do
+      @form[:BBox] = [100, 50, 100, 200]
+      @canvas.xobject(@form, at: [0, 0])
+      assert_operators(@page.contents, [])
+
+      @form[:BBox] = [100, 50, 150, 50]
+      @canvas.xobject(@form, at: [0, 0])
+      assert_operators(@page.contents, [])
+    end
   end
 
   describe "character_spacing" do

data/test/hexapdf/test_writer.rb

@@ -40,7 +40,7 @@ describe HexaPDF::Writer do
       219
       %%EOF
       3 0 obj
-      <</Producer(HexaPDF version 0.15.0)>>
+      <</Producer(HexaPDF version 0.15.1)>>
       endobj
       xref
       3 1
@@ -72,7 +72,7 @@ describe HexaPDF::Writer do
       141
       %%EOF
       6 0 obj
-      <</Producer(HexaPDF version 0.15.0)>>
+      <</Producer(HexaPDF version 0.15.1)>>
       endobj
       2 0 obj
       <</Length 10>>stream

data/test/hexapdf/utils/test_graphics_helpers.rb

@@ -15,9 +15,17 @@ describe HexaPDF::Utils::GraphicsHelpers do
       assert_equal([10, 12], calculate_dimensions(5, 6, rwidth: 10))
     end
 
+    it "returns the requested width and the given height if width is zero" do
+      assert_equal([10, 6], calculate_dimensions(0, 6, rwidth: 10))
+    end
+
     it "returns the requested height and an adjusted width" do
       assert_equal([10, 12], calculate_dimensions(5, 6, rheight: 12))
     end
+
+    it "returns the requested height and the given width if height is zero" do
+      assert_equal([5, 12], calculate_dimensions(5, 0, rheight: 12))
+    end
   end
 
   describe "point_on_line" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hexapdf
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.15.1
 platform: ruby
 authors:
 - Thomas Leitner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-12 00:00:00.000000000 Z
+date: 2021-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cmdparse