OpenSystemsDevelopment / qpdf

Commit 90a97bf4efcb38748fde1addd3d49d682f0ae728

Authored by Jay Berkenbilt
1 parent 5b2e5430

Include filename in verbose output for overlay/underlay

Inline Side-by-side
Showing 8 changed files with 128 additions and 128 deletions
libqpdf/QPDFJob.cc
  View file @90a97bf
@@ -1899,7 +1899,7 @@ QPDFJob::doUnderOverlayForPage( @@ -1899,7 +1899,7 @@ QPDFJob::doUnderOverlayForPage(
1899 QPDFObjectHandle resources = dest_page.getAttribute("/Resources", true); 1899 QPDFObjectHandle resources = dest_page.getAttribute("/Resources", true);
1900 for (int from_pageno: pagenos[pageno][uo_idx]) { 1900 for (int from_pageno: pagenos[pageno][uo_idx]) {
1901 doIfVerbose([&](Pipeline& v, std::string const& prefix) { 1901 doIfVerbose([&](Pipeline& v, std::string const& prefix) {
1902 - v << " " << uo.which << " " << from_pageno << "\n"; 1902 + v << " " << uo.filename << " " << uo.which << " " << from_pageno << "\n";
1903 }); 1903 });
1904 auto from_page = pages.at(QIntC::to_size(from_pageno - 1)); 1904 auto from_page = pages.at(QIntC::to_size(from_pageno - 1));
1905 if (fo[from_pageno].count(uo_idx) == 0) { 1905 if (fo[from_pageno].count(uo_idx) == 0) {
qpdf/qtest/qpdf/uo-1.out
  View file @90a97bf
1 qpdf: processing underlay/overlay 1 qpdf: processing underlay/overlay
2 page 1 2 page 1
3 - underlay 1  
4 - overlay 1 3 + fxo-green.pdf underlay 1
  4 + fxo-blue.pdf overlay 1
5 page 2 5 page 2
6 - underlay 2  
7 - overlay 2 6 + fxo-green.pdf underlay 2
  7 + fxo-blue.pdf overlay 2
8 page 3 8 page 3
9 - underlay 3  
10 - overlay 3 9 + fxo-green.pdf underlay 3
  10 + fxo-blue.pdf overlay 3
11 page 4 11 page 4
12 - underlay 4  
13 - overlay 4 12 + fxo-green.pdf underlay 4
  13 + fxo-blue.pdf overlay 4
14 page 5 14 page 5
15 - underlay 5  
16 - overlay 5 15 + fxo-green.pdf underlay 5
  16 + fxo-blue.pdf overlay 5
17 page 6 17 page 6
18 - underlay 6  
19 - overlay 6 18 + fxo-green.pdf underlay 6
  19 + fxo-blue.pdf overlay 6
20 page 7 20 page 7
21 - underlay 7  
22 - overlay 7 21 + fxo-green.pdf underlay 7
  22 + fxo-blue.pdf overlay 7
23 page 8 23 page 8
24 - underlay 8  
25 - overlay 8 24 + fxo-green.pdf underlay 8
  25 + fxo-blue.pdf overlay 8
26 page 9 26 page 9
27 - underlay 8  
28 - overlay 9 27 + fxo-green.pdf underlay 8
  28 + fxo-blue.pdf overlay 9
29 page 10 29 page 10
30 - underlay 8  
31 - overlay 10 30 + fxo-green.pdf underlay 8
  31 + fxo-blue.pdf overlay 10
32 page 11 32 page 11
33 - underlay 8  
34 - overlay 11 33 + fxo-green.pdf underlay 8
  34 + fxo-blue.pdf overlay 11
35 page 12 35 page 12
36 - underlay 8  
37 - overlay 12 36 + fxo-green.pdf underlay 8
  37 + fxo-blue.pdf overlay 12
38 page 13 38 page 13
39 - underlay 8  
40 - overlay 13 39 + fxo-green.pdf underlay 8
  40 + fxo-blue.pdf overlay 13
41 page 14 41 page 14
42 - underlay 8  
43 - overlay 14 42 + fxo-green.pdf underlay 8
  43 + fxo-blue.pdf overlay 14
44 page 15 44 page 15
45 - overlay 15 45 + fxo-blue.pdf overlay 15
46 page 16 46 page 16
47 - overlay 16 47 + fxo-blue.pdf overlay 16
48 qpdf: wrote file a.pdf 48 qpdf: wrote file a.pdf
qpdf/qtest/qpdf/uo-2.out
  View file @90a97bf
1 qpdf: processing underlay/overlay 1 qpdf: processing underlay/overlay
2 page 1 2 page 1
3 - underlay 16  
4 - overlay 7 3 + fxo-blue.pdf underlay 16
  4 + fxo-green.pdf overlay 7
5 page 2 5 page 2
6 - underlay 15  
7 - overlay 8 6 + fxo-blue.pdf underlay 15
  7 + fxo-green.pdf overlay 8
8 page 3 8 page 3
9 - underlay 14  
10 - overlay 7 9 + fxo-blue.pdf underlay 14
  10 + fxo-green.pdf overlay 7
11 page 4 11 page 4
12 - underlay 13  
13 - overlay 8 12 + fxo-blue.pdf underlay 13
  13 + fxo-green.pdf overlay 8
14 page 5 14 page 5
15 - underlay 12  
16 - overlay 7 15 + fxo-blue.pdf underlay 12
  16 + fxo-green.pdf overlay 7
17 page 6 17 page 6
18 - underlay 11  
19 - overlay 8 18 + fxo-blue.pdf underlay 11
  19 + fxo-green.pdf overlay 8
20 page 7 20 page 7
21 - underlay 10  
22 - overlay 7 21 + fxo-blue.pdf underlay 10
  22 + fxo-green.pdf overlay 7
23 page 8 23 page 8
24 - underlay 9  
25 - overlay 8 24 + fxo-blue.pdf underlay 9
  25 + fxo-green.pdf overlay 8
26 page 9 26 page 9
27 - underlay 8  
28 - overlay 7 27 + fxo-blue.pdf underlay 8
  28 + fxo-green.pdf overlay 7
29 page 10 29 page 10
30 - underlay 7  
31 - overlay 8 30 + fxo-blue.pdf underlay 7
  31 + fxo-green.pdf overlay 8
32 page 11 32 page 11
33 - underlay 6  
34 - overlay 7 33 + fxo-blue.pdf underlay 6
  34 + fxo-green.pdf overlay 7
35 page 12 35 page 12
36 - underlay 5  
37 - overlay 8 36 + fxo-blue.pdf underlay 5
  37 + fxo-green.pdf overlay 8
38 page 13 38 page 13
39 - underlay 4  
40 - overlay 7 39 + fxo-blue.pdf underlay 4
  40 + fxo-green.pdf overlay 7
41 page 14 41 page 14
42 - underlay 3  
43 - overlay 8 42 + fxo-blue.pdf underlay 3
  43 + fxo-green.pdf overlay 8
44 page 15 44 page 15
45 - underlay 2  
46 - overlay 7 45 + fxo-blue.pdf underlay 2
  46 + fxo-green.pdf overlay 7
47 page 16 47 page 16
48 - underlay 1  
49 - overlay 8 48 + fxo-blue.pdf underlay 1
  49 + fxo-green.pdf overlay 8
50 qpdf: wrote file a.pdf 50 qpdf: wrote file a.pdf
qpdf/qtest/qpdf/uo-3.out
  View file @90a97bf
1 qpdf: processing underlay/overlay 1 qpdf: processing underlay/overlay
2 page 1 2 page 1
3 - underlay 16  
4 - overlay 7 3 + fxo-blue.pdf underlay 16
  4 + fxo-green.pdf overlay 7
5 page 2 5 page 2
6 - underlay 15  
7 - overlay 8 6 + fxo-blue.pdf underlay 15
  7 + fxo-green.pdf overlay 8
8 page 3 8 page 3
9 - underlay 14  
10 - overlay 7 9 + fxo-blue.pdf underlay 14
  10 + fxo-green.pdf overlay 7
11 page 4 11 page 4
12 - underlay 13  
13 - overlay 8 12 + fxo-blue.pdf underlay 13
  13 + fxo-green.pdf overlay 8
14 page 5 14 page 5
15 - underlay 12  
16 - overlay 7 15 + fxo-blue.pdf underlay 12
  16 + fxo-green.pdf overlay 7
17 page 6 17 page 6
18 - underlay 11  
19 - overlay 8 18 + fxo-blue.pdf underlay 11
  19 + fxo-green.pdf overlay 8
20 page 7 20 page 7
21 - underlay 10  
22 - overlay 7 21 + fxo-blue.pdf underlay 10
  22 + fxo-green.pdf overlay 7
23 page 8 23 page 8
24 - underlay 9  
25 - overlay 8 24 + fxo-blue.pdf underlay 9
  25 + fxo-green.pdf overlay 8
26 page 9 26 page 9
27 - underlay 8  
28 - overlay 7 27 + fxo-blue.pdf underlay 8
  28 + fxo-green.pdf overlay 7
29 page 10 29 page 10
30 - underlay 7  
31 - overlay 8 30 + fxo-blue.pdf underlay 7
  31 + fxo-green.pdf overlay 8
32 page 11 32 page 11
33 - underlay 6  
34 - overlay 7 33 + fxo-blue.pdf underlay 6
  34 + fxo-green.pdf overlay 7
35 page 12 35 page 12
36 - underlay 5  
37 - overlay 8 36 + fxo-blue.pdf underlay 5
  37 + fxo-green.pdf overlay 8
38 page 13 38 page 13
39 - underlay 4  
40 - overlay 7 39 + fxo-blue.pdf underlay 4
  40 + fxo-green.pdf overlay 7
41 page 14 41 page 14
42 - underlay 3  
43 - overlay 8 42 + fxo-blue.pdf underlay 3
  43 + fxo-green.pdf overlay 8
44 page 15 44 page 15
45 - underlay 2  
46 - overlay 7 45 + fxo-blue.pdf underlay 2
  46 + fxo-green.pdf overlay 7
47 page 16 47 page 16
48 - underlay 1  
49 - overlay 8 48 + fxo-blue.pdf underlay 1
  49 + fxo-green.pdf overlay 8
50 qpdf: wrote file a.pdf 50 qpdf: wrote file a.pdf
qpdf/qtest/qpdf/uo-4.out
  View file @90a97bf
1 qpdf: processing underlay/overlay 1 qpdf: processing underlay/overlay
2 page 1 2 page 1
3 - overlay 1 3 + fxo-green.pdf overlay 1
4 page 2 4 page 2
5 - overlay 2 5 + fxo-green.pdf overlay 2
6 page 3 6 page 3
7 - overlay 3 7 + fxo-green.pdf overlay 3
8 page 4 8 page 4
9 - overlay 4 9 + fxo-green.pdf overlay 4
10 page 5 10 page 5
11 - overlay 5 11 + fxo-green.pdf overlay 5
12 page 6 12 page 6
13 - overlay 6 13 + fxo-green.pdf overlay 6
14 page 7 14 page 7
15 - overlay 7 15 + fxo-green.pdf overlay 7
16 page 8 16 page 8
17 - overlay 8 17 + fxo-green.pdf overlay 8
18 page 9 18 page 9
19 page 10 19 page 10
20 page 11 20 page 11
qpdf/qtest/qpdf/uo-5.out
  View file @90a97bf
@@ -2,15 +2,15 @@ qpdf: processing underlay/overlay @@ -2,15 +2,15 @@ qpdf: processing underlay/overlay
2 page 1 2 page 1
3 page 2 3 page 2
4 page 3 4 page 3
5 - underlay 1 5 + fxo-green.pdf underlay 1
6 page 4 6 page 4
7 - underlay 2 7 + fxo-green.pdf underlay 2
8 page 5 8 page 5
9 - underlay 3 9 + fxo-green.pdf underlay 3
10 page 6 10 page 6
11 - underlay 4 11 + fxo-green.pdf underlay 4
12 page 7 12 page 7
13 - underlay 5 13 + fxo-green.pdf underlay 5
14 page 8 14 page 8
15 page 9 15 page 9
16 page 10 16 page 10
qpdf/qtest/qpdf/uo-6.out
  View file @90a97bf
@@ -5,8 +5,8 @@ qpdf: removing unreferenced pages from primary input @@ -5,8 +5,8 @@ qpdf: removing unreferenced pages from primary input
5 qpdf: adding pages from fxo-red.pdf 5 qpdf: adding pages from fxo-red.pdf
6 qpdf: processing underlay/overlay 6 qpdf: processing underlay/overlay
7 page 1 7 page 1
8 - overlay 1  
9 - overlay 2  
10 - overlay 3  
11 - overlay 4 8 + fxo-blue.pdf overlay 1
  9 + fxo-blue.pdf overlay 2
  10 + fxo-blue.pdf overlay 3
  11 + fxo-blue.pdf overlay 4
12 qpdf: wrote file a.pdf 12 qpdf: wrote file a.pdf
qpdf/qtest/qpdf/uo-7.out
  View file @90a97bf
1 qpdf: processing underlay/overlay 1 qpdf: processing underlay/overlay
2 page 1 2 page 1
3 - overlay 1 3 + 20-pages.pdf overlay 1
4 page 2 4 page 2
5 - overlay 2 5 + 20-pages.pdf overlay 2
6 page 3 6 page 3
7 - overlay 3 7 + 20-pages.pdf overlay 3
8 page 4 8 page 4
9 - overlay 4 9 + 20-pages.pdf overlay 4
10 page 5 10 page 5
11 - overlay 5 11 + 20-pages.pdf overlay 5
12 page 6 12 page 6
13 - overlay 6 13 + 20-pages.pdf overlay 6
14 page 7 14 page 7
15 - overlay 7 15 + 20-pages.pdf overlay 7
16 page 8 16 page 8
17 - overlay 8 17 + 20-pages.pdf overlay 8
18 page 9 18 page 9
19 - overlay 9 19 + 20-pages.pdf overlay 9
20 page 10 20 page 10
21 - overlay 10 21 + 20-pages.pdf overlay 10
22 page 11 22 page 11
23 - overlay 11 23 + 20-pages.pdf overlay 11
24 page 12 24 page 12
25 - overlay 12 25 + 20-pages.pdf overlay 12
26 page 13 26 page 13
27 - overlay 13 27 + 20-pages.pdf overlay 13
28 page 14 28 page 14
29 - overlay 14 29 + 20-pages.pdf overlay 14
30 page 15 30 page 15
31 - overlay 15 31 + 20-pages.pdf overlay 15
32 page 16 32 page 16
33 - overlay 16 33 + 20-pages.pdf overlay 16
34 qpdf: wrote file a.pdf 34 qpdf: wrote file a.pdf