Commit 05ff619b09dc0c2c51f7f56dacd067f2c3baedbc
1 parent
55ee5539
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.
Showing
2 changed files
with
4 additions
and
19 deletions
include/qpdf/QPDFObjectHandle.hh
| @@ -65,8 +65,8 @@ class QPDFObjectHandle | @@ -65,8 +65,8 @@ class QPDFObjectHandle | ||
| 65 | // QPDFWriter may, in some cases, add compression, but if it | 65 | // QPDFWriter may, in some cases, add compression, but if it |
| 66 | // does, it will update the filters as needed. Every call to | 66 | // does, it will update the filters as needed. Every call to |
| 67 | // provideStreamData for a given stream must write the same | 67 | // provideStreamData for a given stream must write the same |
| 68 | - // data.The object ID and generation passed to this method are | ||
| 69 | - // those that belong to the stream on behalf of which the | 68 | + // data. The object ID and generation passed to this method |
| 69 | + // are those that belong to the stream on behalf of which the | ||
| 70 | // provider is called. They may be ignored or used by the | 70 | // provider is called. They may be ignored or used by the |
| 71 | // implementation for indexing or other purposes. This | 71 | // implementation for indexing or other purposes. This |
| 72 | // information is made available just to make it more | 72 | // information is made available just to make it more |
| @@ -442,13 +442,8 @@ class QPDFObjectHandle | @@ -442,13 +442,8 @@ class QPDFObjectHandle | ||
| 442 | bool pipeStreamData(Pipeline*, | 442 | bool pipeStreamData(Pipeline*, |
| 443 | unsigned long encode_flags, | 443 | unsigned long encode_flags, |
| 444 | qpdf_stream_decode_level_e decode_level, | 444 | qpdf_stream_decode_level_e decode_level, |
| 445 | - bool suppress_warnings = false); | ||
| 446 | - QPDF_DLL | ||
| 447 | - bool pipeStreamData(Pipeline*, | ||
| 448 | - unsigned long encode_flags, | ||
| 449 | - qpdf_stream_decode_level_e decode_level, | ||
| 450 | - bool suppress_warnings, | ||
| 451 | - bool will_retry); | 445 | + bool suppress_warnings = false, |
| 446 | + bool will_retry = false); | ||
| 452 | 447 | ||
| 453 | // Legacy pipeStreamData. This maps to the the flags-based | 448 | // Legacy pipeStreamData. This maps to the the flags-based |
| 454 | // pipeStreamData as follows: | 449 | // pipeStreamData as follows: |
libqpdf/QPDFObjectHandle.cc
| @@ -499,16 +499,6 @@ bool | @@ -499,16 +499,6 @@ bool | ||
| 499 | QPDFObjectHandle::pipeStreamData(Pipeline* p, | 499 | QPDFObjectHandle::pipeStreamData(Pipeline* p, |
| 500 | unsigned long encode_flags, | 500 | unsigned long encode_flags, |
| 501 | qpdf_stream_decode_level_e decode_level, | 501 | qpdf_stream_decode_level_e decode_level, |
| 502 | - bool suppress_warnings) | ||
| 503 | -{ | ||
| 504 | - return pipeStreamData( | ||
| 505 | - p, encode_flags, decode_level, suppress_warnings, false); | ||
| 506 | -} | ||
| 507 | - | ||
| 508 | -bool | ||
| 509 | -QPDFObjectHandle::pipeStreamData(Pipeline* p, | ||
| 510 | - unsigned long encode_flags, | ||
| 511 | - qpdf_stream_decode_level_e decode_level, | ||
| 512 | bool suppress_warnings, bool will_retry) | 502 | bool suppress_warnings, bool will_retry) |
| 513 | { | 503 | { |
| 514 | assertStream(); | 504 | assertStream(); |