From da30764bce31efc4e9a228a3554f291215e2055d Mon Sep 17 00:00:00 2001 From: Jay Berkenbilt Date: Thu, 20 Jun 2019 23:29:02 -0400 Subject: [PATCH] Change QPDFObjectHandle::pipeStreamData's encode_flags type Change from unsigned long to int since we pass enumerated type values to this field. --- include/qpdf/QPDFObjectHandle.hh | 2 +- libqpdf/QPDFObjectHandle.cc | 4 ++-- libqpdf/QPDF_Stream.cc | 2 +- libqpdf/qpdf/QPDF_Stream.hh | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/qpdf/QPDFObjectHandle.hh b/include/qpdf/QPDFObjectHandle.hh index 0039f8ee..4ee0b5a0 100644 --- a/include/qpdf/QPDFObjectHandle.hh +++ b/include/qpdf/QPDFObjectHandle.hh @@ -736,7 +736,7 @@ class QPDFObjectHandle // operation will be retried without filtering to avoid data loss. QPDF_DLL bool pipeStreamData(Pipeline*, - unsigned long encode_flags, + int encode_flags, qpdf_stream_decode_level_e decode_level, bool suppress_warnings = false, bool will_retry = false); diff --git a/libqpdf/QPDFObjectHandle.cc b/libqpdf/QPDFObjectHandle.cc index b3f7daec..d182f9bf 100644 --- a/libqpdf/QPDFObjectHandle.cc +++ b/libqpdf/QPDFObjectHandle.cc @@ -1127,7 +1127,7 @@ QPDFObjectHandle::getRawStreamData() bool QPDFObjectHandle::pipeStreamData(Pipeline* p, - unsigned long encode_flags, + int encode_flags, qpdf_stream_decode_level_e decode_level, bool suppress_warnings, bool will_retry) { @@ -1140,7 +1140,7 @@ bool QPDFObjectHandle::pipeStreamData(Pipeline* p, bool filter, bool normalize, bool compress) { - unsigned long encode_flags = 0; + int encode_flags = 0; qpdf_stream_decode_level_e decode_level = qpdf_dl_none; if (filter) { diff --git a/libqpdf/QPDF_Stream.cc b/libqpdf/QPDF_Stream.cc index 3ddb1498..8b904e1f 100644 --- a/libqpdf/QPDF_Stream.cc +++ b/libqpdf/QPDF_Stream.cc @@ -466,7 +466,7 @@ QPDF_Stream::filterable(std::vector& filters, bool QPDF_Stream::pipeStreamData(Pipeline* pipeline, - unsigned long encode_flags, + int encode_flags, qpdf_stream_decode_level_e decode_level, bool suppress_warnings, bool will_retry) { diff --git a/libqpdf/qpdf/QPDF_Stream.hh b/libqpdf/qpdf/QPDF_Stream.hh index 647b600d..b6428cc9 100644 --- a/libqpdf/qpdf/QPDF_Stream.hh +++ b/libqpdf/qpdf/QPDF_Stream.hh @@ -32,7 +32,7 @@ class QPDF_Stream: public QPDFObject // See comments in QPDFObjectHandle.hh for these methods. bool pipeStreamData(Pipeline*, - unsigned long encode_flags, + int encode_flags, qpdf_stream_decode_level_e decode_level, bool suppress_warnings, bool will_retry); PointerHolder getStreamData(qpdf_stream_decode_level_e);