Include filename in verbose output for overlay/underlay

8 files changed, 128 insertions, 128 deletions

diff --git a/libqpdf/QPDFJob.cc b/libqpdf/QPDFJob.cc
index 6aba2561..07abaa49 100644
--- a/libqpdf/QPDFJob.cc
+++ b/libqpdf/QPDFJob.cc
@@ -1899,7 +1899,7 @@ QPDFJob::doUnderOverlayForPage(
     QPDFObjectHandle resources = dest_page.getAttribute("/Resources", true);
     for (int from_pageno: pagenos[pageno][uo_idx]) {
         doIfVerbose([&](Pipeline& v, std::string const& prefix) {
-            v << "    " << uo.which << " " << from_pageno << "\n";
+            v << "    " << uo.filename << " " << uo.which << " " << from_pageno << "\n";
         });
         auto from_page = pages.at(QIntC::to_size(from_pageno - 1));
         if (fo[from_pageno].count(uo_idx) == 0) {
diff --git a/qpdf/qtest/qpdf/uo-1.out b/qpdf/qtest/qpdf/uo-1.out
index d3d5ff3e..050d4a2c 100644
--- a/qpdf/qtest/qpdf/uo-1.out
+++ b/qpdf/qtest/qpdf/uo-1.out
@@ -1,48 +1,48 @@
 qpdf: processing underlay/overlay
   page 1
-    underlay 1
-    overlay 1
+    fxo-green.pdf underlay 1
+    fxo-blue.pdf overlay 1
   page 2
-    underlay 2
-    overlay 2
+    fxo-green.pdf underlay 2
+    fxo-blue.pdf overlay 2
   page 3
-    underlay 3
-    overlay 3
+    fxo-green.pdf underlay 3
+    fxo-blue.pdf overlay 3
   page 4
-    underlay 4
-    overlay 4
+    fxo-green.pdf underlay 4
+    fxo-blue.pdf overlay 4
   page 5
-    underlay 5
-    overlay 5
+    fxo-green.pdf underlay 5
+    fxo-blue.pdf overlay 5
   page 6
-    underlay 6
-    overlay 6
+    fxo-green.pdf underlay 6
+    fxo-blue.pdf overlay 6
   page 7
-    underlay 7
-    overlay 7
+    fxo-green.pdf underlay 7
+    fxo-blue.pdf overlay 7
   page 8
-    underlay 8
-    overlay 8
+    fxo-green.pdf underlay 8
+    fxo-blue.pdf overlay 8
   page 9
-    underlay 8
-    overlay 9
+    fxo-green.pdf underlay 8
+    fxo-blue.pdf overlay 9
   page 10
-    underlay 8
-    overlay 10
+    fxo-green.pdf underlay 8
+    fxo-blue.pdf overlay 10
   page 11
-    underlay 8
-    overlay 11
+    fxo-green.pdf underlay 8
+    fxo-blue.pdf overlay 11
   page 12
-    underlay 8
-    overlay 12
+    fxo-green.pdf underlay 8
+    fxo-blue.pdf overlay 12
   page 13
-    underlay 8
-    overlay 13
+    fxo-green.pdf underlay 8
+    fxo-blue.pdf overlay 13
   page 14
-    underlay 8
-    overlay 14
+    fxo-green.pdf underlay 8
+    fxo-blue.pdf overlay 14
   page 15
-    overlay 15
+    fxo-blue.pdf overlay 15
   page 16
-    overlay 16
+    fxo-blue.pdf overlay 16
 qpdf: wrote file a.pdf
diff --git a/qpdf/qtest/qpdf/uo-2.out b/qpdf/qtest/qpdf/uo-2.out
index cf4e62cc..da17e45b 100644
--- a/qpdf/qtest/qpdf/uo-2.out
+++ b/qpdf/qtest/qpdf/uo-2.out
@@ -1,50 +1,50 @@
 qpdf: processing underlay/overlay
   page 1
-    underlay 16
-    overlay 7
+    fxo-blue.pdf underlay 16
+    fxo-green.pdf overlay 7
   page 2
-    underlay 15
-    overlay 8
+    fxo-blue.pdf underlay 15
+    fxo-green.pdf overlay 8
   page 3
-    underlay 14
-    overlay 7
+    fxo-blue.pdf underlay 14
+    fxo-green.pdf overlay 7
   page 4
-    underlay 13
-    overlay 8
+    fxo-blue.pdf underlay 13
+    fxo-green.pdf overlay 8
   page 5
-    underlay 12
-    overlay 7
+    fxo-blue.pdf underlay 12
+    fxo-green.pdf overlay 7
   page 6
-    underlay 11
-    overlay 8
+    fxo-blue.pdf underlay 11
+    fxo-green.pdf overlay 8
   page 7
-    underlay 10
-    overlay 7
+    fxo-blue.pdf underlay 10
+    fxo-green.pdf overlay 7
   page 8
-    underlay 9
-    overlay 8
+    fxo-blue.pdf underlay 9
+    fxo-green.pdf overlay 8
   page 9
-    underlay 8
-    overlay 7
+    fxo-blue.pdf underlay 8
+    fxo-green.pdf overlay 7
   page 10
-    underlay 7
-    overlay 8
+    fxo-blue.pdf underlay 7
+    fxo-green.pdf overlay 8
   page 11
-    underlay 6
-    overlay 7
+    fxo-blue.pdf underlay 6
+    fxo-green.pdf overlay 7
   page 12
-    underlay 5
-    overlay 8
+    fxo-blue.pdf underlay 5
+    fxo-green.pdf overlay 8
   page 13
-    underlay 4
-    overlay 7
+    fxo-blue.pdf underlay 4
+    fxo-green.pdf overlay 7
   page 14
-    underlay 3
-    overlay 8
+    fxo-blue.pdf underlay 3
+    fxo-green.pdf overlay 8
   page 15
-    underlay 2
-    overlay 7
+    fxo-blue.pdf underlay 2
+    fxo-green.pdf overlay 7
   page 16
-    underlay 1
-    overlay 8
+    fxo-blue.pdf underlay 1
+    fxo-green.pdf overlay 8
 qpdf: wrote file a.pdf
diff --git a/qpdf/qtest/qpdf/uo-3.out b/qpdf/qtest/qpdf/uo-3.out
index cf4e62cc..da17e45b 100644
--- a/qpdf/qtest/qpdf/uo-3.out
+++ b/qpdf/qtest/qpdf/uo-3.out
@@ -1,50 +1,50 @@
 qpdf: processing underlay/overlay
   page 1
-    underlay 16
-    overlay 7
+    fxo-blue.pdf underlay 16
+    fxo-green.pdf overlay 7
   page 2
-    underlay 15
-    overlay 8
+    fxo-blue.pdf underlay 15
+    fxo-green.pdf overlay 8
   page 3
-    underlay 14
-    overlay 7
+    fxo-blue.pdf underlay 14
+    fxo-green.pdf overlay 7
   page 4
-    underlay 13
-    overlay 8
+    fxo-blue.pdf underlay 13
+    fxo-green.pdf overlay 8
   page 5
-    underlay 12
-    overlay 7
+    fxo-blue.pdf underlay 12
+    fxo-green.pdf overlay 7
   page 6
-    underlay 11
-    overlay 8
+    fxo-blue.pdf underlay 11
+    fxo-green.pdf overlay 8
   page 7
-    underlay 10
-    overlay 7
+    fxo-blue.pdf underlay 10
+    fxo-green.pdf overlay 7
   page 8
-    underlay 9
-    overlay 8
+    fxo-blue.pdf underlay 9
+    fxo-green.pdf overlay 8
   page 9
-    underlay 8
-    overlay 7
+    fxo-blue.pdf underlay 8
+    fxo-green.pdf overlay 7
   page 10
-    underlay 7
-    overlay 8
+    fxo-blue.pdf underlay 7
+    fxo-green.pdf overlay 8
   page 11
-    underlay 6
-    overlay 7
+    fxo-blue.pdf underlay 6
+    fxo-green.pdf overlay 7
   page 12
-    underlay 5
-    overlay 8
+    fxo-blue.pdf underlay 5
+    fxo-green.pdf overlay 8
   page 13
-    underlay 4
-    overlay 7
+    fxo-blue.pdf underlay 4
+    fxo-green.pdf overlay 7
   page 14
-    underlay 3
-    overlay 8
+    fxo-blue.pdf underlay 3
+    fxo-green.pdf overlay 8
   page 15
-    underlay 2
-    overlay 7
+    fxo-blue.pdf underlay 2
+    fxo-green.pdf overlay 7
   page 16
-    underlay 1
-    overlay 8
+    fxo-blue.pdf underlay 1
+    fxo-green.pdf overlay 8
 qpdf: wrote file a.pdf
diff --git a/qpdf/qtest/qpdf/uo-4.out b/qpdf/qtest/qpdf/uo-4.out
index aa922dfc..255aa58d 100644
--- a/qpdf/qtest/qpdf/uo-4.out
+++ b/qpdf/qtest/qpdf/uo-4.out
@@ -1,20 +1,20 @@
 qpdf: processing underlay/overlay
   page 1
-    overlay 1
+    fxo-green.pdf overlay 1
   page 2
-    overlay 2
+    fxo-green.pdf overlay 2
   page 3
-    overlay 3
+    fxo-green.pdf overlay 3
   page 4
-    overlay 4
+    fxo-green.pdf overlay 4
   page 5
-    overlay 5
+    fxo-green.pdf overlay 5
   page 6
-    overlay 6
+    fxo-green.pdf overlay 6
   page 7
-    overlay 7
+    fxo-green.pdf overlay 7
   page 8
-    overlay 8
+    fxo-green.pdf overlay 8
   page 9
   page 10
   page 11
diff --git a/qpdf/qtest/qpdf/uo-5.out b/qpdf/qtest/qpdf/uo-5.out
index f9e063f2..808d4a42 100644
--- a/qpdf/qtest/qpdf/uo-5.out
+++ b/qpdf/qtest/qpdf/uo-5.out
@@ -2,15 +2,15 @@ qpdf: processing underlay/overlay
   page 1
   page 2
   page 3
-    underlay 1
+    fxo-green.pdf underlay 1
   page 4
-    underlay 2
+    fxo-green.pdf underlay 2
   page 5
-    underlay 3
+    fxo-green.pdf underlay 3
   page 6
-    underlay 4
+    fxo-green.pdf underlay 4
   page 7
-    underlay 5
+    fxo-green.pdf underlay 5
   page 8
   page 9
   page 10
diff --git a/qpdf/qtest/qpdf/uo-6.out b/qpdf/qtest/qpdf/uo-6.out
index 5a199670..d11b034b 100644
--- a/qpdf/qtest/qpdf/uo-6.out
+++ b/qpdf/qtest/qpdf/uo-6.out
@@ -5,8 +5,8 @@ qpdf: removing unreferenced pages from primary input
 qpdf: adding pages from fxo-red.pdf
 qpdf: processing underlay/overlay
   page 1
-    overlay 1
-    overlay 2
-    overlay 3
-    overlay 4
+    fxo-blue.pdf overlay 1
+    fxo-blue.pdf overlay 2
+    fxo-blue.pdf overlay 3
+    fxo-blue.pdf overlay 4
 qpdf: wrote file a.pdf
diff --git a/qpdf/qtest/qpdf/uo-7.out b/qpdf/qtest/qpdf/uo-7.out
index 4f722ead..814d9ba4 100644
--- a/qpdf/qtest/qpdf/uo-7.out
+++ b/qpdf/qtest/qpdf/uo-7.out
@@ -1,34 +1,34 @@
 qpdf: processing underlay/overlay
   page 1
-    overlay 1
+    20-pages.pdf overlay 1
   page 2
-    overlay 2
+    20-pages.pdf overlay 2
   page 3
-    overlay 3
+    20-pages.pdf overlay 3
   page 4
-    overlay 4
+    20-pages.pdf overlay 4
   page 5
-    overlay 5
+    20-pages.pdf overlay 5
   page 6
-    overlay 6
+    20-pages.pdf overlay 6
   page 7
-    overlay 7
+    20-pages.pdf overlay 7
   page 8
-    overlay 8
+    20-pages.pdf overlay 8
   page 9
-    overlay 9
+    20-pages.pdf overlay 9
   page 10
-    overlay 10
+    20-pages.pdf overlay 10
   page 11
-    overlay 11
+    20-pages.pdf overlay 11
   page 12
-    overlay 12
+    20-pages.pdf overlay 12
   page 13
-    overlay 13
+    20-pages.pdf overlay 13
   page 14
-    overlay 14
+    20-pages.pdf overlay 14
   page 15
-    overlay 15
+    20-pages.pdf overlay 15
   page 16
-    overlay 16
+    20-pages.pdf overlay 16
 qpdf: wrote file a.pdf