bin/diff-pdf-page.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0e0d8377b3a22e61758d8dc566c1af8ddc4ed28f
Author:     Justin Luth <[email protected]>
AuthorDate: Tue Oct 22 16:53:37 2024 -0400
Commit:     Miklos Vajna <[email protected]>
CommitDate: Fri Oct 25 09:20:48 2024 +0200

    diff-pdf-page.py: use magick order for -composite
    
    Apparently, "convert" allows a unix ordering
    which doesn't work when using the "magick" alternative under Windows.
    
    The point here is that -composite is an action
    for the third image argument,
    so it needs to come after the reading in of the source image-sequence.
    
    Change-Id: Ic9345d616c6c62c211c5b7eb359c4019501bef2b
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175454
    Reviewed-by: Justin Luth <[email protected]>
    Tested-by: Jenkins
    Reviewed-by: László Németh <[email protected]>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175561
    Tested-by: Jenkins CollaboraOffice <[email protected]>
    Reviewed-by: Miklos Vajna <[email protected]>

diff --git a/bin/diff-pdf-page.py b/bin/diff-pdf-page.py
index 153654d5d386..0e60db34bdc2 100755
--- a/bin/diff-pdf-page.py
+++ b/bin/diff-pdf-page.py
@@ -33,7 +33,7 @@ def main():
     b_pdf = args.b_pdf + "[" + args.page + "]"
     run(["convert", "-density", args.density, b_pdf, "-colorspace", "RGB", 
b_png.name])
     composite_png = tempfile.NamedTemporaryFile(suffix=".png")
-    run(["convert", "-composite", a_png.name, b_png.name, composite_png.name])
+    run(["convert", a_png.name, b_png.name, "-composite", composite_png.name])
     run(["convert", composite_png.name, "-background", "white", "-flatten", 
args.diff_png])
 
 if __name__ == "__main__":

Reply via email to