D18179: PDF: Implement scaling options for non-rasterized printing

[Nathaniel Graham]

ngraham added a comment.


  This patch no longer applies cleanly to master:
  
    Switched to branch 'master'
    Your branch is up to date with 'origin/master'.
    Already up to date.
    Deleted branch arcpatch-D18179 (was 8bf1a9117).
     INFO  Base commit is not in local repository; trying to fetch.
    Created and checked out branch arcpatch-D18179.
    Created and checked out branch arcpatch-D10974.
    Checking patch part.cpp...
    Checking patch interfaces/printinterface.h...
    Checking patch generators/poppler/generator_pdf.h...
    Checking patch generators/poppler/generator_pdf.cpp...
    Checking patch core/printoptionswidget.h...
    Checking patch core/printoptionswidget.cpp...
    Checking patch core/fileprinter.cpp...
    Checking patch core/document.h...
    Checking patch CMakeLists.txt...
    Applied patch part.cpp cleanly.
    Applied patch interfaces/printinterface.h cleanly.
    Applied patch generators/poppler/generator_pdf.h cleanly.
    Applied patch generators/poppler/generator_pdf.cpp cleanly.
    Applied patch core/printoptionswidget.h cleanly.
    Applied patch core/printoptionswidget.cpp cleanly.
    Applied patch core/fileprinter.cpp cleanly.
    Applied patch core/document.h cleanly.
    Applied patch CMakeLists.txt cleanly.
    
     Cherry Pick Failed!
     Exception 
    Command failed with error #1!
    COMMAND
    git cherry-pick 'arcpatch-D10974'
    
    STDOUT
    On branch arcpatch-D18179
    You are currently cherry-picking commit 4cc9a85f0.
    
    nothing to commit, working tree clean
    
    
    STDERR
    The previous cherry-pick is now empty, possibly due to conflict resolution.
    If you wish to commit it anyway, use:
    
        git commit --allow-empty
    
    Otherwise, please use 'git reset'
    
    (Run with `--trace` for a full exception trace.)
  
  Could you rebase on master?

REPOSITORY
  R223 Okular

REVISION DETAIL
  https://phabricator.kde.org/D18179

To: michaelweghorn, #okular, ngraham, sander
Cc: aacid, fvogt, okular-devel, joaonetto, tfella, ngraham, darcyshen
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/okular-devel/attachments/20190403/681a12b7/attachment.html>