hexapdf 1.11.0 → 1.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da17a2a9dd8459e6f4624f59621c84f1b0be73f4d23347bffcdd6c534b58680e
-  data.tar.gz: ecdcfedc4f89722f799d04fda467acbed24bf256a1fa626623fce1d6399d6d98
+  metadata.gz: 8cf7d72b14ba19f840f63adbcfa3eb5b1fd7b876731c52c615788f395d23d10d
+  data.tar.gz: 48d506505dcc50d5cc5c596f7e11b8d0961dbea82cea7223c1ae8d705bb9b57e
 SHA512:
-  metadata.gz: 5a39a7635005c7ef8be1dc0a1efc21b1aca00fba3bedb80886e5d909d9fc0ebfed0f967fff6f10f96ed6b05a883fee0337fea3802bfcde3a93a644e512d0ee3b
-  data.tar.gz: 4e9ccdbe854d0e5fb00e7042d61c758da93c5b354982b48a20f4a6cec3a07d209dac5711d1eb9b3b6274d8662acac8851124a838bed5795cc6e40c924f4bba26
+  metadata.gz: 47be93a799dd59bcab3fcb92c150a0e1b43b8b115dc4d1b38fc029907222a856dde0e717309c85c312fbd3351f0483ccd50f72194f5fce1352eeb1330d92ef39
+  data.tar.gz: 154edc9c8bf7f2e4f3e354c38c5b52a6f1099760ace8d86c4feb38e0092d0dd0ee3630f615196890e98db339204e636b43fdaac9dd2884b21b36780b59da7bde

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+## 1.11.1 - 2026-10-06
+
+### Changed
+
+* [HexaPDF::Type::OptionalContentGroup] methods `#apply_intent`, `#on!`,
+  `#off!`, `#add_to_ui` to return self
+
+### Fixed
+
+* [HexaPDF::Type::AcroForm::Form] validation to also remove objects with an
+  invalid /Type field
+
+
 ## 1.11.0 - 2026-09-22
 
 ### Added

data/examples/027-composer_optional_content.rb

@@ -21,13 +21,14 @@ HexaPDF::Composer.create('composer_optional_content.pdf') do |composer|
     answer: {font: 'ZapfDingbats', fill_color: "green"},
   )
 
-  all = composer.document.optional_content.ocg('All answers')
-  a1 = composer.document.optional_content.ocg('Answer 1')
-  a1m = composer.document.optional_content.create_ocmd([a1, all], policy: :any_on)
-  a2 = composer.document.optional_content.ocg('Answer 2')
-  a2m = composer.document.optional_content.create_ocmd([a2, all], policy: :any_on)
-  a3 = composer.document.optional_content.ocg('Answer 3')
-  a3m = composer.document.optional_content.create_ocmd([a3, all], policy: :any_on)
+  oc = composer.document.optional_content
+  all = oc.ocg('All answers').off!.add_to_ui
+  a1 = oc.ocg('Answer 1').off!.add_to_ui
+  a2 = oc.ocg('Answer 2').off!.add_to_ui
+  a3 = oc.ocg('Answer 3').off!.add_to_ui
+  a1m = oc.create_ocmd([a1, all], policy: :any_on)
+  a2m = oc.create_ocmd([a2, all], policy: :any_on)
+  a3m = oc.create_ocmd([a3, all], policy: :any_on)
 
   composer.text('The Great Ruby Quiz', text_align: :center, margin: [0, 0, 24],
                 font: 'Helvetica bold', font_size: 24)
@@ -41,7 +42,7 @@ HexaPDF::Composer.create('composer_optional_content.pdf') do |composer|
           answers.multiple do |answer|
             answer.text('Yukihiro “Matz” Matsumoto', position: :float)
             answer.text("\u{a0}\u{a0}✔", style: :answer,
-                        properties: {'optional_content' => a1})
+                        properties: {'optional_content' => a1m})
           end
           answers.text('Rob Pike')
         end
@@ -57,7 +58,7 @@ HexaPDF::Composer.create('composer_optional_content.pdf') do |composer|
           answers.multiple do |answer|
             answer.text('1993', position: :float)
             answer.text("\u{a0}\u{a0}✔", style: :answer,
-                        properties: {'optional_content' => a2})
+                        properties: {'optional_content' => a2m})
           end
         end
       end
@@ -68,7 +69,7 @@ HexaPDF::Composer.create('composer_optional_content.pdf') do |composer|
       answer = composer.document.layout.text('There are several PDF libraries for ' \
                                              'Ruby but the best is HexaPDF! :)',
                                              width: 400,
-                                             properties: {'optional_content' => a3})
+                                             properties: {'optional_content' => a3m})
       item.formatted_text([{box: answer}], border: {width: [0, 0, 1]})
     end
   end
@@ -77,9 +78,4 @@ HexaPDF::Composer.create('composer_optional_content.pdf') do |composer|
   action.add_state_change(:toggle, [a1, a2, a3])
   composer.text("Click to toggle answers", border: {width: 1, color: "red"},
                 align: :right, padding: 2, overlays: [[:link, action: action]])
-
-  composer.document.optional_content.default_configuration(
-    BaseState: :OFF,
-    Order: [all, a1, a2, a3],
-  )
 end

data/lib/hexapdf/image_loader/png.rb

@@ -346,33 +346,49 @@ module HexaPDF
       def separate_alpha_channel(offset, decode_parms)
         bytes_per_colors = (decode_parms[:BitsPerComponent] * decode_parms[:Colors] + 7) / 8
         bytes_per_alpha = (decode_parms[:BitsPerComponent] + 7) / 8
+        bytes_per_pixel = bytes_per_colors + bytes_per_alpha
         bytes_per_row = (decode_parms[:Columns] * decode_parms[:BitsPerComponent] *
           (decode_parms[:Colors] + 1) + 7) / 8 + 1
-        image_data = ''.b
-        mask_data = ''.b
 
         flate_decode = @document.config.constantize('filter.map', :FlateDecode)
         source = flate_decode.decoder(Fiber.new(&image_data_proc(offset)))
 
+        image_deflate = Zlib::Deflate.new(HexaPDF::GlobalConfiguration['filter.flate_compression'],
+                                          Zlib::MAX_WBITS,
+                                          HexaPDF::GlobalConfiguration['filter.flate_memory'])
+        mask_deflate = Zlib::Deflate.new(HexaPDF::GlobalConfiguration['filter.flate_compression'],
+                                         Zlib::MAX_WBITS,
+                                         HexaPDF::GlobalConfiguration['filter.flate_memory'])
+
+        image_data = ''.b
+        mask_data = ''.b
+        image_temp = ''.b
+        mask_temp = ''.b
         data = ''.b
         while source.alive? && (new_data = source.resume)
           data << new_data
-          while data.length >= bytes_per_row
-            i = 1
-            image_data << data.getbyte(0)
-            mask_data << data.getbyte(0)
-            while i < bytes_per_row
-              bytes_per_colors.times {|j| image_data << data.getbyte(i + j) }
-              i += bytes_per_colors
-              bytes_per_alpha.times {|j| mask_data << data.getbyte(i + j) }
-              i += bytes_per_alpha
+          i = 0
+          image_temp.clear
+          mask_temp.clear
+          while i + bytes_per_row <= data.length
+            image_temp << data.getbyte(i)
+            mask_temp << data.getbyte(i)
+            i += 1
+            row_loop_end_index = i + bytes_per_row - 1
+            while i < row_loop_end_index
+              image_temp << data.byteslice(i, bytes_per_colors)
+              mask_temp << data.byteslice(i + bytes_per_colors, bytes_per_alpha)
+              i += bytes_per_pixel
             end
-            data = data[bytes_per_row..-1]
           end
+          image_data << image_deflate.deflate(image_temp)
+          mask_data << mask_deflate.deflate(mask_temp)
+          data = data[i..-1]
         end
-
-        image_data = Filter.string_from_source(flate_decode.encoder(Fiber.new { image_data }))
-        mask_data = Filter.string_from_source(flate_decode.encoder(Fiber.new { mask_data }))
+        image_data << image_deflate.finish
+        mask_data << mask_deflate.finish
+        image_deflate.close
+        mask_deflate.close
 
         [image_data, mask_data]
       end

data/lib/hexapdf/type/acro_form/form.rb

@@ -573,7 +573,8 @@ module HexaPDF
 
           validate_array = lambda do |parent, container|
             container.map! do |field|
-              if !field.kind_of?(HexaPDF::Object) || !field.kind_of?(HexaPDF::Dictionary) || field.null?
+              if !field.kind_of?(HexaPDF::Object) || !field.kind_of?(HexaPDF::Dictionary) ||
+                 field.null? || (field.key?(:Type) && field[:Type] != :Annot)
                 yield("Invalid object in AcroForm field hierarchy", true)
                 next nil
               end

data/lib/hexapdf/type/optional_content_group.rb

@@ -187,10 +187,14 @@ module HexaPDF
         end
       end
 
-      # Applies the given intent (:View, :Design or a custom intent) to the OCG.
+      # :call-seq:
+      #   ocg.apply_intent(intent)   -> ocg
+      #
+      # Applies the given intent (:View, :Design or a custom intent) to the OCG and returns +self+.
       def apply_intent(intent)
         self[:Intent] = key?(:Intent) ? Array(self[:Intent]) : []
         self[:Intent] << intent
+        self
       end
 
       # Returns +true+ if this OCG has an intent of :View.
@@ -209,23 +213,35 @@ module HexaPDF
         document.optional_content.default_configuration.ocg_on?(self)
       end
 
+      # :call-seq:
+      #   ocg.on!   -> ocg
+      #
       # Sets the state of the OCG to on in the default configuration (see
-      # OptionalContentProperties#default_configuration).
+      # OptionalContentProperties#default_configuration) and returns +self+.
       def on!
         document.optional_content.default_configuration.ocg_state(self, :on)
+        self
       end
 
+      # :call-seq:
+      #   ocg.off!   -> ocg
+      #
       # Sets the state of the OCG to off in the default configuration (see
-      # OptionalContentProperties#default_configuration).
+      # OptionalContentProperties#default_configuration) and returns +self+.
       def off!
         document.optional_content.default_configuration.ocg_state(self, :off)
+        self
       end
 
+      # :call-seq:
+      #   ocg.add_to_ui(path: nil)    -> ocg
+      #
       # Adds the OCG to the PDF processor's user interface in the default configuration (see
       # OptionalContentProperties#default_configuration), either at the top-level or under the given
-      # hierarchical +path+ but always as the last item.
+      # hierarchical +path+ but always as the last item, and returns +self+.
       def add_to_ui(path: nil)
         document.optional_content.default_configuration.add_ocg_to_ui(self, path: path)
+        self
       end
 
       # :call-seq:

data/lib/hexapdf/version.rb

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

data/test/hexapdf/type/acro_form/test_form.rb

@@ -537,6 +537,7 @@ describe HexaPDF::Type::AcroForm::Form do
           @doc.add({T: :Tx3, FT: :Tx, Kids: [@doc.add({T: :Tx4}),
                                              [:nothing],
                                              @doc.add({T: :Tx5, Kids: [@doc.add({T: :Tx6})]})]}),
+          @doc.wrap({Type: :Page}),
         ]
         @acro_form[:Fields][6][:Kids][0][:Parent] = @acro_form[:Fields][6]
         @acro_form[:Fields][6][:Kids][2][:Parent] = @acro_form[:Fields][6]

data/test/hexapdf/type/test_optional_content_group.rb

@@ -69,7 +69,8 @@ describe HexaPDF::Type::OptionalContentGroup do
     end
 
     it "can apply one or more intents" do
-      @ocg.apply_intent(:View)
+      ocg = @ocg.apply_intent(:View)
+      assert_same(@ocg, ocg)
       @ocg.apply_intent(:Design)
       assert(@ocg.intent_view?)
       assert(@ocg.intent_design?)
@@ -85,17 +86,20 @@ describe HexaPDF::Type::OptionalContentGroup do
 
     it "can set its default state to on" do
       @doc.optional_content.default_configuration[:OFF] = [@ocg]
-      @ocg.on!
+      ocg = @ocg.on!
+      assert_same(@ocg, ocg)
       assert(@ocg.on?)
     end
 
     it "can set its default state to off" do
-      @ocg.off!
+      ocg = @ocg.off!
+      assert_same(@ocg, ocg)
       refute(@ocg.on?)
     end
 
     it "can add itself to the UI" do
-      @ocg.add_to_ui(path: 'Test')
+      ocg = @ocg.add_to_ui(path: 'Test')
+      assert_same(@ocg, ocg)
       assert_equal([['Test', @ocg]], @doc.optional_content.default_configuration[:Order].value)
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hexapdf
 version: !ruby/object:Gem::Version
-  version: 1.11.0
+  version: 1.11.1
 platform: ruby
 authors:
   - Thomas Leitner