From f8164f69abb1dfa054d069d6baf414b32052f0c3 Mon Sep 17 00:00:00 2001 From: Marcos de Melo Date: Mon, 22 Aug 2022 11:55:32 -0300 Subject: [PATCH 1/2] Fix render of some PDF elements --- lib/combine_pdf/pdf_protected.rb | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/lib/combine_pdf/pdf_protected.rb b/lib/combine_pdf/pdf_protected.rb index 8e78a28..2cb31f0 100644 --- a/lib/combine_pdf/pdf_protected.rb +++ b/lib/combine_pdf/pdf_protected.rb @@ -33,12 +33,7 @@ def add_referenced() if obj.is_a?(Hash) referenced = obj[:referenced_object] if referenced && referenced.any? - tmp = resolved[referenced.object_id] - if !tmp && referenced[:raw_stream_content] - tmp = existing[referenced[:raw_stream_content]] - # Avoid endless recursion by limiting it to a number of layers (default == 2) - tmp = nil unless equal_layers(tmp, referenced) - end + tmp = resolved[referenced.object_id] || existing[referenced] if tmp obj[:referenced_object] = tmp else From ffdce0589fb8c8a237fd119abd404728faef1117 Mon Sep 17 00:00:00 2001 From: Marcos de Melo Date: Mon, 29 Aug 2022 23:52:06 -0300 Subject: [PATCH 2/2] more refact --- lib/combine_pdf/pdf_protected.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/combine_pdf/pdf_protected.rb b/lib/combine_pdf/pdf_protected.rb index 2cb31f0..a320eee 100644 --- a/lib/combine_pdf/pdf_protected.rb +++ b/lib/combine_pdf/pdf_protected.rb @@ -33,12 +33,11 @@ def add_referenced() if obj.is_a?(Hash) referenced = obj[:referenced_object] if referenced && referenced.any? - tmp = resolved[referenced.object_id] || existing[referenced] + tmp = resolved[referenced.object_id] if tmp obj[:referenced_object] = tmp else resolved[obj.object_id] = referenced - # existing[referenced] = referenced existing[referenced[:raw_stream_content]] = referenced should_resolve << referenced @objects << referenced