summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJay Berkenbilt <jberkenbilt@users.noreply.github.com>2023-09-03 14:37:14 +0200
committerGitHub <noreply@github.com>2023-09-03 14:37:14 +0200
commitfec75b44b4d5b0ee84c5bf98fee6139dceacfde3 (patch)
treec784585ab8eb64571909712a87bef16c7863e6bb
parentc6a3d83fb5958684436c8b607509079da22193f3 (diff)
parent94e6323206b42cb7c086edd25ec15d6cea672de8 (diff)
downloadqpdf-fec75b44b4d5b0ee84c5bf98fee6139dceacfde3.tar.zst
Merge pull request #1030 from m-holger/exit
Fix exit code when an input other than the primary input generates wa…
-rw-r--r--libqpdf/QPDFJob.cc6
-rw-r--r--qpdf/qtest/page-errors.test2
-rw-r--r--qpdf/qtest/qpdf/page-missing-mediabox.out1
3 files changed, 8 insertions, 1 deletions
diff --git a/libqpdf/QPDFJob.cc b/libqpdf/QPDFJob.cc
index b8ae7787..5296b7b3 100644
--- a/libqpdf/QPDFJob.cc
+++ b/libqpdf/QPDFJob.cc
@@ -477,6 +477,12 @@ QPDFJob::createQPDF()
}
handleUnderOverlay(pdf);
handleTransformations(pdf);
+
+ for (auto& foreign: page_heap) {
+ if (foreign->anyWarnings()) {
+ m->warnings = true;
+ }
+ }
return pdf_sp;
}
diff --git a/qpdf/qtest/page-errors.test b/qpdf/qtest/page-errors.test
index 60894f96..3f14f24e 100644
--- a/qpdf/qtest/page-errors.test
+++ b/qpdf/qtest/page-errors.test
@@ -22,7 +22,7 @@ $td->runtest("handle page no with contents",
$td->NORMALIZE_NEWLINES);
$td->runtest("handle page with missing MediaBox",
{$td->COMMAND => "qpdf --static-id --empty --pages page-no-content.pdf -- out.pdf"},
- {$td->FILE => "page-missing-mediabox.out", $td->EXIT_STATUS => 0},
+ {$td->FILE => "page-missing-mediabox.out", $td->EXIT_STATUS => 3},
$td->NORMALIZE_NEWLINES);
$td->runtest("check output",
{$td->FILE => "out.pdf"},
diff --git a/qpdf/qtest/qpdf/page-missing-mediabox.out b/qpdf/qtest/qpdf/page-missing-mediabox.out
index 9db62ed6..91e85707 100644
--- a/qpdf/qtest/qpdf/page-missing-mediabox.out
+++ b/qpdf/qtest/qpdf/page-missing-mediabox.out
@@ -1 +1,2 @@
WARNING: page-no-content.pdf, object 4 0 at offset 288: kid 1 (from 0) MediaBox is undefined; setting to letter / ANSI A
+qpdf: operation succeeded with warnings; resulting file may have some problems