From 05ff619b09dc0c2c51f7f56dacd067f2c3baedbc Mon Sep 17 00:00:00 2001 From: Jay Berkenbilt Date: Tue, 30 Jan 2018 17:21:22 -0500 Subject: [PATCH] Remove redundant method Remove a redundant method that was equal to another one with additional arguments. This breaks binary compatibility, but there are other ABI breaking changes in the upcoming release, so now is the time to do it. --- include/qpdf/QPDFObjectHandle.hh | 13 ++++--------- libqpdf/QPDFObjectHandle.cc | 10 ---------- 2 files changed, 4 insertions(+), 19 deletions(-) diff --git a/include/qpdf/QPDFObjectHandle.hh b/include/qpdf/QPDFObjectHandle.hh index 3dd09168..cd4c4767 100644 --- a/include/qpdf/QPDFObjectHandle.hh +++ b/include/qpdf/QPDFObjectHandle.hh @@ -65,8 +65,8 @@ class QPDFObjectHandle // QPDFWriter may, in some cases, add compression, but if it // does, it will update the filters as needed. Every call to // provideStreamData for a given stream must write the same - // data.The object ID and generation passed to this method are - // those that belong to the stream on behalf of which the + // data. The object ID and generation passed to this method + // are those that belong to the stream on behalf of which the // provider is called. They may be ignored or used by the // implementation for indexing or other purposes. This // information is made available just to make it more @@ -442,13 +442,8 @@ class QPDFObjectHandle bool pipeStreamData(Pipeline*, unsigned long encode_flags, qpdf_stream_decode_level_e decode_level, - bool suppress_warnings = false); - QPDF_DLL - bool pipeStreamData(Pipeline*, - unsigned long encode_flags, - qpdf_stream_decode_level_e decode_level, - bool suppress_warnings, - bool will_retry); + bool suppress_warnings = false, + bool will_retry = false); // Legacy pipeStreamData. This maps to the the flags-based // pipeStreamData as follows: diff --git a/libqpdf/QPDFObjectHandle.cc b/libqpdf/QPDFObjectHandle.cc index 1fa02427..fb15cb1c 100644 --- a/libqpdf/QPDFObjectHandle.cc +++ b/libqpdf/QPDFObjectHandle.cc @@ -495,16 +495,6 @@ QPDFObjectHandle::getRawStreamData() return dynamic_cast(obj.getPointer())->getRawStreamData(); } -bool -QPDFObjectHandle::pipeStreamData(Pipeline* p, - unsigned long encode_flags, - qpdf_stream_decode_level_e decode_level, - bool suppress_warnings) -{ - return pipeStreamData( - p, encode_flags, decode_level, suppress_warnings, false); -} - bool QPDFObjectHandle::pipeStreamData(Pipeline* p, unsigned long encode_flags,