Skip to content

Hoist image generation into main() #11

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Jun 6, 2017
Merged

Hoist image generation into main() #11

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 7 additions & 8 deletions pdf_diff/command_line.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,8 +165,8 @@ def mark_difference(hunk_length, offset, boxes, changes):
# there's no reason to hold onto it. It can't be marked as changed twice.
changes.append(boxes.pop(0))

# Turns a JSON object of PDF changes into a PNG and writes it to stream.
def render_changes(changes, styles, stream):
# Turns a JSON object of PDF changes into a PIL image object.
def render_changes(changes, styles):
# Merge sequential boxes to avoid sequential disjoint rectangles.

changes = simplify_changes(changes)
Expand Down Expand Up @@ -209,10 +209,7 @@ def render_changes(changes, styles, stream):

img = stack_pages(page_groups)

# Write it out.

img.save(stream, "PNG")

return img

def make_pages_images(changes):
pages = [{}, {}]
Expand Down Expand Up @@ -430,7 +427,7 @@ def pdftopng(pdffile, pagenumber, width=900):
def main():
if len(sys.argv) == 2 and sys.argv[1] == "--changes":
# to just do the rendering part
render_changes(json.load(sys.stdin), sys.stdout.buffer)
render_changes(json.load(sys.stdin))
sys.exit(0)

if len(sys.argv) <= 1:
Expand All @@ -456,7 +453,9 @@ def main():
right_file = args.pop(0)

changes = compute_changes(left_file, right_file, top_margin=top_margin)
render_changes(changes, styles, sys.stdout.buffer)
img = render_changes(changes, styles)
img.save(sys.stdout.buffer, "PNG")


if __name__ == "__main__":
main()