From 26514ab7315ad3ecf29f113fa777326d13646a66 Mon Sep 17 00:00:00 2001 From: Jay Berkenbilt Date: Wed, 29 Apr 2020 17:33:11 -0400 Subject: Write linearization errors to stderr (fixes #438) --- ChangeLog | 5 +++++ libqpdf/QPDF_linearization.cc | 10 +++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index d6a79855..1007af7e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2020-04-29 Jay Berkenbilt + + * Bug fix: qpdf --check was writing errors and warnings reported + by checkLinearization to stdout instead of stderr. Fixes #438. + 2020-04-09 Jay Berkenbilt * 10.0.1: release diff --git a/libqpdf/QPDF_linearization.cc b/libqpdf/QPDF_linearization.cc index 3dff1c17..49593f81 100644 --- a/libqpdf/QPDF_linearization.cc +++ b/libqpdf/QPDF_linearization.cc @@ -73,7 +73,7 @@ QPDF::checkLinearization() } catch (QPDFExc& e) { - *this->m->out_stream << e.what() << std::endl; + *this->m->err_stream << e.what() << std::endl; } return result; } @@ -386,7 +386,7 @@ QPDF::readHintStream(Pipeline& pl, qpdf_offset_t offset, size_t length) if ((computed_end < min_end_offset) || (computed_end > max_end_offset)) { - *this->m->out_stream << "expected = " << computed_end + *this->m->err_stream << "expected = " << computed_end << "; actual = " << min_end_offset << ".." << max_end_offset << std::endl; throw QPDFExc(qpdf_e_damaged_pdf, this->m->file->getName(), @@ -661,7 +661,7 @@ QPDF::checkLinearizationInternal() for (std::list::iterator iter = errors.begin(); iter != errors.end(); ++iter) { - *this->m->out_stream << "WARNING: " << (*iter) << std::endl; + *this->m->err_stream << "WARNING: " << (*iter) << std::endl; } } @@ -671,7 +671,7 @@ QPDF::checkLinearizationInternal() for (std::list::iterator iter = warnings.begin(); iter != warnings.end(); ++iter) { - *this->m->out_stream << "WARNING: " << (*iter) << std::endl; + *this->m->err_stream << "WARNING: " << (*iter) << std::endl; } } @@ -1094,7 +1094,7 @@ QPDF::showLinearizationData() } catch (QPDFExc& e) { - *this->m->out_stream << e.what() << std::endl; + *this->m->err_stream << e.what() << std::endl; } } -- cgit v1.2.3-54-g00ecf