combine_pdf 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a262d8592dbe90e0a4930aebadda8866b731a586
-  data.tar.gz: fdf9a2877028b673f55d23741f8c8f59af647a4f
+  metadata.gz: aae99be65f85291a4eb366e78d93e015822e1dcd
+  data.tar.gz: b92628654f3a544d3fd54fe3b9e56c344227605c
 SHA512:
-  metadata.gz: 763aa425d24ef58b83717123f4ef7c962d2ecd083a39275df136950872e286af49d0efbc8f8d2a2f4cf0967439848c151e587073497a8ff1a7fd9b0f9ef42d7f
-  data.tar.gz: 1c86313e09d88a07e4a2ee43fd53ce445b784770140a6892854d8f50d9dff9140c5fd993ae4d50b54ffa12f0cea6fb706a1026e18304185ccdedae3ceee0fbcb
+  metadata.gz: ac30f12f96a4bd58e1290859713f88917639f1ff92ba3d14ab72cfdfbdd70655727cd30a1082374fdf43e0fc8f1f502323a8b35c8f37d8a059a89baf096fb221
+  data.tar.gz: 4e2d3f8609b1f531c95c1e28af217eaf6e93a9a112ee96e2678d562ccb7bc895b5629b56fb90e6631a891ae1fed45985ab6cafab2ec999d52a3c1e7bbfbd11e4

data/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 ***
 
+#### Change log v.1.0.5
+
+**Fix**: Fix issue #116 where some PDF objects (the page catalog and some root information data) were written twice to the saved PDF file (or String). Credit to @albertsaave  for exposing the issue using GhostScript.
+
+***
+
+#### Change log v.1.0.4
+
+**Fix**: Fix issue #115 where PDF object versioning was being assumed to update the `indirect generation number`, allowing Object Streams to be inflated at the end of the parsed data collection instead of the middle. Fixed the issue by pre-emptive object deletion and by inflating Object Streams in place. Credit to @joshirashmics for exposing the issue.
+
+***
+
 #### Change log v.1.0.3
 
 **Fix**: Fix issue #111 where some fonts would cause `pdf.fonts` to break the PDF. Credit to Pavel Slabý (@paulslaby) for exposing the issue.

data/lib/combine_pdf/pdf_protected.rb

@@ -16,16 +16,18 @@ module CombinePDF
     # @private
     # Some PDF objects contain references to other PDF objects.
     #
-    # this function adds the references contained in `@objects`.
+    # this function adds the references contained in these objects.
     #
     # this is used for internal operations, such as injectng data using the << operator.
-    def add_referenced(should_resolve = [])
+    def add_referenced()
       # add references but not root
       dup_pages = nil
       # an existing object map
       resolved = {}.dup
       existing = {}.dup
-      @objects.each { |obj| existing[obj] = obj }
+      should_resolve = [].dup
+      #set all existing objects as resolved and register their children for future resolution
+      @objects.each { |obj| existing[obj] = obj ; resolved[obj.object_id] = obj; should_resolve << obj.values}
       # loop until should_resolve is empty
       while should_resolve.any?
         obj = should_resolve.pop
@@ -112,7 +114,7 @@ module CombinePDF
       # inject new catalog and pages objects
       @objects << @info if @info
       @objects << catalog_object
-      @objects << pages_object
+      # @objects << pages_object
 
       # rebuild/rename the forms dictionary
       if @forms_data.nil? || @forms_data.empty?
@@ -156,8 +158,7 @@ module CombinePDF
       catalog = rebuild_catalog
       page_objects = catalog[:Pages][:referenced_object][:Kids].map { |e| @objects << e[:referenced_object]; e[:referenced_object] }
       # adds every referenced object to the @objects (root), addition is performed as pointers rather then copies
-      # add_referenced([page_objects, @forms_data, @names, @outlines, @info])
-      add_referenced(@objects.dup)
+      add_referenced()
       catalog
     end
 
@@ -345,6 +346,7 @@ module CombinePDF
 
     def equal_layers obj1, obj2, layer = 3
       return true   if(layer == 0)
+      return true if obj1.object_id == obj2.object_id
       if obj1.is_a? Hash
         return false unless obj2.is_a? Hash
         keys = obj1.keys;

data/lib/combine_pdf/version.rb

@@ -1,3 +1,3 @@
 module CombinePDF
-  VERSION = '1.0.4'.freeze
+  VERSION = '1.0.5'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: combine_pdf
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Boaz Segev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-07 00:00:00.000000000 Z
+date: 2017-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-rc4