Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Optimize #add_referenced #238

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions lib/combine_pdf/pdf_protected.rb
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ def add_referenced()
existing = {}.dup
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}
@objects.each { |obj| existing[obj.hash] = obj ; resolved[obj.object_id] = obj; should_resolve << obj.values}
# loop until should_resolve is empty
while should_resolve.any?
obj = should_resolve.pop
Expand All @@ -35,16 +35,18 @@ def add_referenced()
if referenced && referenced.any?
tmp = resolved[referenced.object_id]
if !tmp && referenced[:raw_stream_content]
tmp = existing[referenced[:raw_stream_content]]
tmp = existing[referenced[:raw_stream_content].hash]
# Avoid endless recursion by limiting it to a number of layers (default == 2)
tmp = nil unless equal_layers(tmp, referenced)
end
if tmp
old_key = obj.hash
obj[:referenced_object] = tmp
existing[obj.hash] = existing.delete(old_key)
else
resolved[obj.object_id] = referenced
# existing[referenced] = referenced
existing[referenced[:raw_stream_content]] = referenced
existing[referenced[:raw_stream_content].hash] = referenced
should_resolve << referenced
@objects << referenced
end
Expand Down