Commit da30764bce31efc4e9a228a3554f291215e2055d
1 parent
3608afd5
Change QPDFObjectHandle::pipeStreamData's encode_flags type
Change from unsigned long to int since we pass enumerated type values to this field.
Showing
4 changed files
with
5 additions
and
5 deletions
include/qpdf/QPDFObjectHandle.hh
| @@ -736,7 +736,7 @@ class QPDFObjectHandle | @@ -736,7 +736,7 @@ class QPDFObjectHandle | ||
| 736 | // operation will be retried without filtering to avoid data loss. | 736 | // operation will be retried without filtering to avoid data loss. |
| 737 | QPDF_DLL | 737 | QPDF_DLL |
| 738 | bool pipeStreamData(Pipeline*, | 738 | bool pipeStreamData(Pipeline*, |
| 739 | - unsigned long encode_flags, | 739 | + int encode_flags, |
| 740 | qpdf_stream_decode_level_e decode_level, | 740 | qpdf_stream_decode_level_e decode_level, |
| 741 | bool suppress_warnings = false, | 741 | bool suppress_warnings = false, |
| 742 | bool will_retry = false); | 742 | bool will_retry = false); |
libqpdf/QPDFObjectHandle.cc
| @@ -1127,7 +1127,7 @@ QPDFObjectHandle::getRawStreamData() | @@ -1127,7 +1127,7 @@ QPDFObjectHandle::getRawStreamData() | ||
| 1127 | 1127 | ||
| 1128 | bool | 1128 | bool |
| 1129 | QPDFObjectHandle::pipeStreamData(Pipeline* p, | 1129 | QPDFObjectHandle::pipeStreamData(Pipeline* p, |
| 1130 | - unsigned long encode_flags, | 1130 | + int encode_flags, |
| 1131 | qpdf_stream_decode_level_e decode_level, | 1131 | qpdf_stream_decode_level_e decode_level, |
| 1132 | bool suppress_warnings, bool will_retry) | 1132 | bool suppress_warnings, bool will_retry) |
| 1133 | { | 1133 | { |
| @@ -1140,7 +1140,7 @@ bool | @@ -1140,7 +1140,7 @@ bool | ||
| 1140 | QPDFObjectHandle::pipeStreamData(Pipeline* p, bool filter, | 1140 | QPDFObjectHandle::pipeStreamData(Pipeline* p, bool filter, |
| 1141 | bool normalize, bool compress) | 1141 | bool normalize, bool compress) |
| 1142 | { | 1142 | { |
| 1143 | - unsigned long encode_flags = 0; | 1143 | + int encode_flags = 0; |
| 1144 | qpdf_stream_decode_level_e decode_level = qpdf_dl_none; | 1144 | qpdf_stream_decode_level_e decode_level = qpdf_dl_none; |
| 1145 | if (filter) | 1145 | if (filter) |
| 1146 | { | 1146 | { |
libqpdf/QPDF_Stream.cc
| @@ -466,7 +466,7 @@ QPDF_Stream::filterable(std::vector<std::string>& filters, | @@ -466,7 +466,7 @@ QPDF_Stream::filterable(std::vector<std::string>& filters, | ||
| 466 | 466 | ||
| 467 | bool | 467 | bool |
| 468 | QPDF_Stream::pipeStreamData(Pipeline* pipeline, | 468 | QPDF_Stream::pipeStreamData(Pipeline* pipeline, |
| 469 | - unsigned long encode_flags, | 469 | + int encode_flags, |
| 470 | qpdf_stream_decode_level_e decode_level, | 470 | qpdf_stream_decode_level_e decode_level, |
| 471 | bool suppress_warnings, bool will_retry) | 471 | bool suppress_warnings, bool will_retry) |
| 472 | { | 472 | { |
libqpdf/qpdf/QPDF_Stream.hh
| @@ -32,7 +32,7 @@ class QPDF_Stream: public QPDFObject | @@ -32,7 +32,7 @@ class QPDF_Stream: public QPDFObject | ||
| 32 | 32 | ||
| 33 | // See comments in QPDFObjectHandle.hh for these methods. | 33 | // See comments in QPDFObjectHandle.hh for these methods. |
| 34 | bool pipeStreamData(Pipeline*, | 34 | bool pipeStreamData(Pipeline*, |
| 35 | - unsigned long encode_flags, | 35 | + int encode_flags, |
| 36 | qpdf_stream_decode_level_e decode_level, | 36 | qpdf_stream_decode_level_e decode_level, |
| 37 | bool suppress_warnings, bool will_retry); | 37 | bool suppress_warnings, bool will_retry); |
| 38 | PointerHolder<Buffer> getStreamData(qpdf_stream_decode_level_e); | 38 | PointerHolder<Buffer> getStreamData(qpdf_stream_decode_level_e); |