From 7f043fe88ed8d7ce14a67cbfaf0c0b18015b8f9f Mon Sep 17 00:00:00 2001 From: m-holger Date: Sat, 20 May 2023 11:25:58 +0100 Subject: Remove unused include directives --- libqpdf/Pl_ASCIIHexDecoder.cc | 1 - 1 file changed, 1 deletion(-) (limited to 'libqpdf/Pl_ASCIIHexDecoder.cc') diff --git a/libqpdf/Pl_ASCIIHexDecoder.cc b/libqpdf/Pl_ASCIIHexDecoder.cc index f1c4785b..48836f58 100644 --- a/libqpdf/Pl_ASCIIHexDecoder.cc +++ b/libqpdf/Pl_ASCIIHexDecoder.cc @@ -3,7 +3,6 @@ #include #include #include -#include Pl_ASCIIHexDecoder::Pl_ASCIIHexDecoder(char const* identifier, Pipeline* next) : Pipeline(identifier, next), -- cgit v1.2.3-70-g09d2 From e28f4efb00d5040fa71532d76e63aa7ade105c99 Mon Sep 17 00:00:00 2001 From: m-holger Date: Sat, 20 May 2023 12:22:32 +0100 Subject: Replace deprecated C++ includes --- examples/pdf-bookmarks.cc | 4 ++-- examples/pdf-count-strings.cc | 2 +- examples/pdf-create.cc | 2 +- examples/pdf-double-page-size.cc | 4 ++-- examples/pdf-filter-tokens.cc | 2 +- examples/pdf-invert-images.cc | 4 ++-- examples/pdf-mod-info.cc | 6 +++--- examples/pdf-npages.cc | 4 ++-- examples/pdf-overlay-page.cc | 2 +- examples/pdf-parse-content.cc | 2 +- examples/pdf-set-form-values.cc | 2 +- examples/pdf-split-pages.cc | 2 +- include/qpdf/Buffer.hh | 2 +- include/qpdf/InputSource.hh | 2 +- include/qpdf/Pl_StdioFile.hh | 2 +- include/qpdf/QPDF.hh | 2 +- include/qpdf/QPDFTokenizer.hh | 2 +- include/qpdf/QPDFWriter.hh | 2 +- include/qpdf/QUtil.hh | 4 ++-- include/qpdf/RandomDataProvider.hh | 2 +- libqpdf/BufferInputSource.cc | 2 +- libqpdf/FileInputSource.cc | 2 +- libqpdf/InputSource.cc | 2 +- libqpdf/InsecureRandomDataProvider.cc | 2 +- libqpdf/MD5.cc | 2 +- libqpdf/Pl_ASCII85Decoder.cc | 2 +- libqpdf/Pl_ASCIIHexDecoder.cc | 2 +- libqpdf/Pl_Buffer.cc | 4 ++-- libqpdf/Pl_DCT.cc | 2 +- libqpdf/Pl_Flate.cc | 4 ++-- libqpdf/Pl_LZWDecoder.cc | 2 +- libqpdf/Pl_PNGFilter.cc | 4 ++-- libqpdf/Pl_StdioFile.cc | 2 +- libqpdf/Pl_TIFFPredictor.cc | 4 ++-- libqpdf/QPDF.cc | 4 ++-- libqpdf/QPDFFormFieldObjectHelper.cc | 2 +- libqpdf/QPDFJob.cc | 2 +- libqpdf/QPDFJob_argv.cc | 6 +++--- libqpdf/QPDFObjectHandle.cc | 6 +++--- libqpdf/QPDFSystemError.cc | 2 +- libqpdf/QPDFTokenizer.cc | 4 ++-- libqpdf/QPDFWriter.cc | 2 +- libqpdf/QPDF_encryption.cc | 2 +- libqpdf/QPDF_linearization.cc | 4 ++-- libqpdf/QTC.cc | 2 +- libqpdf/QUtil.cc | 10 +++++----- libqpdf/qpdf/BitStream.hh | 2 +- libqpdf/qpdf/BitWriter.hh | 2 +- libtests/aes.cc | 6 +++--- libtests/ascii85.cc | 2 +- libtests/bits.cc | 2 +- libtests/buffer.cc | 2 +- libtests/closed_file_input_source.cc | 2 +- libtests/dct_compress.cc | 6 +++--- libtests/dct_uncompress.cc | 4 ++-- libtests/flate.cc | 2 +- libtests/hex.cc | 2 +- libtests/lzw.cc | 4 ++-- libtests/md5.cc | 2 +- libtests/predictors.cc | 4 ++-- libtests/qintc.cc | 2 +- libtests/qutil.cc | 6 +++--- libtests/rc4.cc | 6 +++--- libtests/runlength.cc | 6 +++--- libtests/sha2.cc | 2 +- qpdf/pdf_from_scratch.cc | 6 +++--- qpdf/test_driver.cc | 8 ++++---- qpdf/test_large_file.cc | 4 ++-- qpdf/test_pdf_doc_encoding.cc | 4 ++-- qpdf/test_pdf_unicode.cc | 4 ++-- qpdf/test_tokenizer.cc | 6 +++--- qpdf/test_unicode_filenames.cc | 4 ++-- zlib-flate/zlib-flate.cc | 6 +++--- 73 files changed, 121 insertions(+), 121 deletions(-) (limited to 'libqpdf/Pl_ASCIIHexDecoder.cc') diff --git a/examples/pdf-bookmarks.cc b/examples/pdf-bookmarks.cc index b6f87e49..d507f559 100644 --- a/examples/pdf-bookmarks.cc +++ b/examples/pdf-bookmarks.cc @@ -5,8 +5,8 @@ #include #include #include -#include -#include +#include +#include // This program demonstrates extraction of bookmarks using the qpdf // outlines API. Note that all the information shown by this program diff --git a/examples/pdf-count-strings.cc b/examples/pdf-count-strings.cc index 09c4a1f5..584d630b 100644 --- a/examples/pdf-count-strings.cc +++ b/examples/pdf-count-strings.cc @@ -5,7 +5,7 @@ // #include -#include +#include #include #include diff --git a/examples/pdf-create.cc b/examples/pdf-create.cc index 56af4a8d..7898479a 100644 --- a/examples/pdf-create.cc +++ b/examples/pdf-create.cc @@ -16,7 +16,7 @@ #include #include #include -#include +#include static char const* whoami = nullptr; diff --git a/examples/pdf-double-page-size.cc b/examples/pdf-double-page-size.cc index 1ebe71df..d1fb3344 100644 --- a/examples/pdf-double-page-size.cc +++ b/examples/pdf-double-page-size.cc @@ -5,8 +5,8 @@ #include #include #include -#include -#include +#include +#include static char const* whoami = nullptr; diff --git a/examples/pdf-filter-tokens.cc b/examples/pdf-filter-tokens.cc index 8824b391..173feb6a 100644 --- a/examples/pdf-filter-tokens.cc +++ b/examples/pdf-filter-tokens.cc @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include #include diff --git a/examples/pdf-invert-images.cc b/examples/pdf-invert-images.cc index 9ffb9c1f..06d74198 100644 --- a/examples/pdf-invert-images.cc +++ b/examples/pdf-invert-images.cc @@ -6,8 +6,8 @@ #include #include #include -#include -#include +#include +#include static char const* whoami = nullptr; diff --git a/examples/pdf-mod-info.cc b/examples/pdf-mod-info.cc index fa49738b..196ce979 100644 --- a/examples/pdf-mod-info.cc +++ b/examples/pdf-mod-info.cc @@ -6,9 +6,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include static char const* version = "1.1"; static char const* whoami = nullptr; diff --git a/examples/pdf-npages.cc b/examples/pdf-npages.cc index 3d34d489..e98d1365 100644 --- a/examples/pdf-npages.cc +++ b/examples/pdf-npages.cc @@ -1,6 +1,6 @@ #include -#include -#include +#include +#include #include #include diff --git a/examples/pdf-overlay-page.cc b/examples/pdf-overlay-page.cc index d40bf0e1..5c7bf46f 100644 --- a/examples/pdf-overlay-page.cc +++ b/examples/pdf-overlay-page.cc @@ -4,7 +4,7 @@ #include #include #include -#include +#include // This program demonstrates use of form XObjects to overlay a page // from one file onto all pages of another file. The qpdf program's diff --git a/examples/pdf-parse-content.cc b/examples/pdf-parse-content.cc index 85abcabc..49440418 100644 --- a/examples/pdf-parse-content.cc +++ b/examples/pdf-parse-content.cc @@ -1,5 +1,5 @@ #include -#include +#include #include #include diff --git a/examples/pdf-set-form-values.cc b/examples/pdf-set-form-values.cc index 281e139e..d13f0608 100644 --- a/examples/pdf-set-form-values.cc +++ b/examples/pdf-set-form-values.cc @@ -4,7 +4,7 @@ #include #include #include -#include +#include static char const* whoami = nullptr; diff --git a/examples/pdf-split-pages.cc b/examples/pdf-split-pages.cc index 5d65853e..6a4f149b 100644 --- a/examples/pdf-split-pages.cc +++ b/examples/pdf-split-pages.cc @@ -12,7 +12,7 @@ #include #include -#include +#include #include static bool static_id = false; diff --git a/include/qpdf/Buffer.hh b/include/qpdf/Buffer.hh index c5d55da1..06615e2c 100644 --- a/include/qpdf/Buffer.hh +++ b/include/qpdf/Buffer.hh @@ -26,7 +26,7 @@ #include // unused -- remove in qpdf 12 (see #785) #include -#include +#include class Buffer { diff --git a/include/qpdf/InputSource.hh b/include/qpdf/InputSource.hh index 68a787c6..c66066fb 100644 --- a/include/qpdf/InputSource.hh +++ b/include/qpdf/InputSource.hh @@ -27,7 +27,7 @@ #include #include -#include +#include #include // Remember to use QPDF_DLL_CLASS on anything derived from InputSource diff --git a/include/qpdf/Pl_StdioFile.hh b/include/qpdf/Pl_StdioFile.hh index 1508af2b..d175d3c3 100644 --- a/include/qpdf/Pl_StdioFile.hh +++ b/include/qpdf/Pl_StdioFile.hh @@ -26,7 +26,7 @@ #include -#include +#include // // This pipeline is reusable. diff --git a/include/qpdf/QPDF.hh b/include/qpdf/QPDF.hh index 4541db64..5567a686 100644 --- a/include/qpdf/QPDF.hh +++ b/include/qpdf/QPDF.hh @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/include/qpdf/QPDFTokenizer.hh b/include/qpdf/QPDFTokenizer.hh index 79d0d3cd..4de7a637 100644 --- a/include/qpdf/QPDFTokenizer.hh +++ b/include/qpdf/QPDFTokenizer.hh @@ -28,7 +28,7 @@ #include // unused -- remove in qpdf 12 (see #785) #include -#include +#include #include class QPDFTokenizer diff --git a/include/qpdf/QPDFWriter.hh b/include/qpdf/QPDFWriter.hh index c2896209..15b5579f 100644 --- a/include/qpdf/QPDFWriter.hh +++ b/include/qpdf/QPDFWriter.hh @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/include/qpdf/QUtil.hh b/include/qpdf/QUtil.hh index 4d46f630..5291fe09 100644 --- a/include/qpdf/QUtil.hh +++ b/include/qpdf/QUtil.hh @@ -30,9 +30,9 @@ #include #include #include -#include +#include #include -#include +#include #include class RandomDataProvider; diff --git a/include/qpdf/RandomDataProvider.hh b/include/qpdf/RandomDataProvider.hh index 5023b4d0..d40bd1f1 100644 --- a/include/qpdf/RandomDataProvider.hh +++ b/include/qpdf/RandomDataProvider.hh @@ -23,7 +23,7 @@ #define RANDOMDATAPROVIDER_HH #include -#include // for size_t +#include // for size_t class QPDF_DLL_CLASS RandomDataProvider { diff --git a/libqpdf/BufferInputSource.cc b/libqpdf/BufferInputSource.cc index 005692ae..33ab44f6 100644 --- a/libqpdf/BufferInputSource.cc +++ b/libqpdf/BufferInputSource.cc @@ -3,7 +3,7 @@ #include #include #include -#include +#include BufferInputSource::BufferInputSource( std::string const& description, Buffer* buf, bool own_memory) : diff --git a/libqpdf/FileInputSource.cc b/libqpdf/FileInputSource.cc index 7c4d6d42..a5f0f4f0 100644 --- a/libqpdf/FileInputSource.cc +++ b/libqpdf/FileInputSource.cc @@ -3,7 +3,7 @@ #include #include #include -#include +#include FileInputSource::FileInputSource() : close_file(false), diff --git a/libqpdf/InputSource.cc b/libqpdf/InputSource.cc index 33ab44d1..3a4bb88a 100644 --- a/libqpdf/InputSource.cc +++ b/libqpdf/InputSource.cc @@ -3,7 +3,7 @@ #include #include #include -#include +#include void InputSource::setLastOffset(qpdf_offset_t offset) diff --git a/libqpdf/InsecureRandomDataProvider.cc b/libqpdf/InsecureRandomDataProvider.cc index cb67cada..90a548ee 100644 --- a/libqpdf/InsecureRandomDataProvider.cc +++ b/libqpdf/InsecureRandomDataProvider.cc @@ -2,7 +2,7 @@ #include #include -#include +#include InsecureRandomDataProvider::InsecureRandomDataProvider() : seeded_random(false) diff --git a/libqpdf/MD5.cc b/libqpdf/MD5.cc index 57419374..9668c982 100644 --- a/libqpdf/MD5.cc +++ b/libqpdf/MD5.cc @@ -4,7 +4,7 @@ #include #include -#include +#include MD5::MD5() { diff --git a/libqpdf/Pl_ASCII85Decoder.cc b/libqpdf/Pl_ASCII85Decoder.cc index 1e3d1b4f..e43b4a86 100644 --- a/libqpdf/Pl_ASCII85Decoder.cc +++ b/libqpdf/Pl_ASCII85Decoder.cc @@ -2,7 +2,7 @@ #include #include -#include +#include Pl_ASCII85Decoder::Pl_ASCII85Decoder(char const* identifier, Pipeline* next) : Pipeline(identifier, next), diff --git a/libqpdf/Pl_ASCIIHexDecoder.cc b/libqpdf/Pl_ASCIIHexDecoder.cc index 48836f58..5590efba 100644 --- a/libqpdf/Pl_ASCIIHexDecoder.cc +++ b/libqpdf/Pl_ASCIIHexDecoder.cc @@ -1,7 +1,7 @@ #include #include -#include +#include #include Pl_ASCIIHexDecoder::Pl_ASCIIHexDecoder(char const* identifier, Pipeline* next) : diff --git a/libqpdf/Pl_Buffer.cc b/libqpdf/Pl_Buffer.cc index ca29ef60..d942465d 100644 --- a/libqpdf/Pl_Buffer.cc +++ b/libqpdf/Pl_Buffer.cc @@ -2,8 +2,8 @@ #include #include -#include -#include +#include +#include Pl_Buffer::Pl_Buffer(char const* identifier, Pipeline* next) : Pipeline(identifier, next), diff --git a/libqpdf/Pl_DCT.cc b/libqpdf/Pl_DCT.cc index 35587875..c01398ad 100644 --- a/libqpdf/Pl_DCT.cc +++ b/libqpdf/Pl_DCT.cc @@ -3,7 +3,7 @@ #include #include -#include +#include #include #include diff --git a/libqpdf/Pl_Flate.cc b/libqpdf/Pl_Flate.cc index 61873ffa..6bbcd1be 100644 --- a/libqpdf/Pl_Flate.cc +++ b/libqpdf/Pl_Flate.cc @@ -1,7 +1,7 @@ #include -#include -#include +#include +#include #include #include diff --git a/libqpdf/Pl_LZWDecoder.cc b/libqpdf/Pl_LZWDecoder.cc index 000fb64b..1c2d6807 100644 --- a/libqpdf/Pl_LZWDecoder.cc +++ b/libqpdf/Pl_LZWDecoder.cc @@ -4,7 +4,7 @@ #include #include #include -#include +#include Pl_LZWDecoder::Pl_LZWDecoder( char const* identifier, Pipeline* next, bool early_code_change) : diff --git a/libqpdf/Pl_PNGFilter.cc b/libqpdf/Pl_PNGFilter.cc index e2a9a0db..41088e1a 100644 --- a/libqpdf/Pl_PNGFilter.cc +++ b/libqpdf/Pl_PNGFilter.cc @@ -3,9 +3,9 @@ #include #include -#include +#include #include -#include +#include static int abs_diff(int a, int b) diff --git a/libqpdf/Pl_StdioFile.cc b/libqpdf/Pl_StdioFile.cc index dca16bf6..b83d0a9e 100644 --- a/libqpdf/Pl_StdioFile.cc +++ b/libqpdf/Pl_StdioFile.cc @@ -3,7 +3,7 @@ #include #include -#include +#include #include Pl_StdioFile::Members::Members(FILE* f) : diff --git a/libqpdf/Pl_TIFFPredictor.cc b/libqpdf/Pl_TIFFPredictor.cc index c29396db..45b6d396 100644 --- a/libqpdf/Pl_TIFFPredictor.cc +++ b/libqpdf/Pl_TIFFPredictor.cc @@ -5,9 +5,9 @@ #include #include -#include +#include #include -#include +#include #include Pl_TIFFPredictor::Pl_TIFFPredictor( diff --git a/libqpdf/QPDF.cc b/libqpdf/QPDF.cc index c7cc1370..bc88b5d6 100644 --- a/libqpdf/QPDF.cc +++ b/libqpdf/QPDF.cc @@ -9,8 +9,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/libqpdf/QPDFFormFieldObjectHelper.cc b/libqpdf/QPDFFormFieldObjectHelper.cc index e76e3121..93dc0e63 100644 --- a/libqpdf/QPDFFormFieldObjectHelper.cc +++ b/libqpdf/QPDFFormFieldObjectHelper.cc @@ -6,7 +6,7 @@ #include #include #include -#include +#include QPDFFormFieldObjectHelper::QPDFFormFieldObjectHelper(QPDFObjectHandle oh) : QPDFObjectHelper(oh), diff --git a/libqpdf/QPDFJob.cc b/libqpdf/QPDFJob.cc index fbaa53e5..14583104 100644 --- a/libqpdf/QPDFJob.cc +++ b/libqpdf/QPDFJob.cc @@ -3,7 +3,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/libqpdf/QPDFJob_argv.cc b/libqpdf/QPDFJob_argv.cc index 55696f5d..5534cd39 100644 --- a/libqpdf/QPDFJob_argv.cc +++ b/libqpdf/QPDFJob_argv.cc @@ -3,12 +3,12 @@ // See "HOW TO ADD A COMMAND-LINE ARGUMENT" in README-maintainer. #include -#include +#include #include #include #include -#include -#include +#include +#include #include #include diff --git a/libqpdf/QPDFObjectHandle.cc b/libqpdf/QPDFObjectHandle.cc index b3f208a5..e276bf4f 100644 --- a/libqpdf/QPDFObjectHandle.cc +++ b/libqpdf/QPDFObjectHandle.cc @@ -30,10 +30,10 @@ #include #include -#include -#include +#include +#include #include -#include +#include using namespace std::literals; diff --git a/libqpdf/QPDFSystemError.cc b/libqpdf/QPDFSystemError.cc index 65fa3121..ebd0d773 100644 --- a/libqpdf/QPDFSystemError.cc +++ b/libqpdf/QPDFSystemError.cc @@ -1,6 +1,6 @@ #include -#include +#include QPDFSystemError::QPDFSystemError( std::string const& description, int system_errno) : diff --git a/libqpdf/QPDFTokenizer.cc b/libqpdf/QPDFTokenizer.cc index d8d457ab..d83080b2 100644 --- a/libqpdf/QPDFTokenizer.cc +++ b/libqpdf/QPDFTokenizer.cc @@ -11,8 +11,8 @@ #include #include -#include -#include +#include +#include static inline bool is_delimiter(char ch) diff --git a/libqpdf/QPDFWriter.cc b/libqpdf/QPDFWriter.cc index de1aa45b..56b4e1ef 100644 --- a/libqpdf/QPDFWriter.cc +++ b/libqpdf/QPDFWriter.cc @@ -24,7 +24,7 @@ #include #include -#include +#include QPDFWriter::ProgressReporter::~ProgressReporter() { diff --git a/libqpdf/QPDF_encryption.cc b/libqpdf/QPDF_encryption.cc index 2e5ddefb..64ca10f1 100644 --- a/libqpdf/QPDF_encryption.cc +++ b/libqpdf/QPDF_encryption.cc @@ -17,7 +17,7 @@ #include #include -#include +#include static unsigned char const padding_string[] = { 0x28, 0xbf, 0x4e, 0x5e, 0x4e, 0x75, 0x8a, 0x41, 0x64, 0x00, 0x4e, diff --git a/libqpdf/QPDF_linearization.cc b/libqpdf/QPDF_linearization.cc index 5b72943a..eade317e 100644 --- a/libqpdf/QPDF_linearization.cc +++ b/libqpdf/QPDF_linearization.cc @@ -13,8 +13,8 @@ #include #include -#include -#include +#include +#include template static void diff --git a/libqpdf/QTC.cc b/libqpdf/QTC.cc index 8188846c..e537a0e1 100644 --- a/libqpdf/QTC.cc +++ b/libqpdf/QTC.cc @@ -3,7 +3,7 @@ #include #include #include -#include +#include static bool tc_active(char const* const scope) diff --git a/libqpdf/QUtil.cc b/libqpdf/QUtil.cc index 72b2a55f..4f9c1021 100644 --- a/libqpdf/QUtil.cc +++ b/libqpdf/QUtil.cc @@ -9,8 +9,8 @@ #include #include -#include -#include +#include +#include #include #include #include @@ -21,9 +21,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #ifndef QPDF_NO_WCHAR_T # include #endif diff --git a/libqpdf/qpdf/BitStream.hh b/libqpdf/qpdf/BitStream.hh index 14555c5d..b807f56c 100644 --- a/libqpdf/qpdf/BitStream.hh +++ b/libqpdf/qpdf/BitStream.hh @@ -3,7 +3,7 @@ #ifndef BITSTREAM_HH #define BITSTREAM_HH -#include +#include class BitStream { diff --git a/libqpdf/qpdf/BitWriter.hh b/libqpdf/qpdf/BitWriter.hh index ca237d47..33fdd8f4 100644 --- a/libqpdf/qpdf/BitWriter.hh +++ b/libqpdf/qpdf/BitWriter.hh @@ -3,7 +3,7 @@ #ifndef BITWRITER_HH #define BITWRITER_HH -#include +#include class Pipeline; diff --git a/libtests/aes.cc b/libtests/aes.cc index 3ad491cc..4541fffe 100644 --- a/libtests/aes.cc +++ b/libtests/aes.cc @@ -4,9 +4,9 @@ #include #include -#include -#include -#include +#include +#include +#include static void usage() diff --git a/libtests/ascii85.cc b/libtests/ascii85.cc index 2acc56ba..8d926898 100644 --- a/libtests/ascii85.cc +++ b/libtests/ascii85.cc @@ -2,7 +2,7 @@ #include #include -#include +#include int main() diff --git a/libtests/bits.cc b/libtests/bits.cc index 0db956e1..e63ebdd3 100644 --- a/libtests/bits.cc +++ b/libtests/bits.cc @@ -4,7 +4,7 @@ #include #include #include -#include +#include // See comments in bits_functions.hh #define BITS_TESTING 1 diff --git a/libtests/buffer.cc b/libtests/buffer.cc index f372e7b4..66eaa71c 100644 --- a/libtests/buffer.cc +++ b/libtests/buffer.cc @@ -7,7 +7,7 @@ #include #include #include -#include +#include static unsigned char* uc(char const* s) diff --git a/libtests/closed_file_input_source.cc b/libtests/closed_file_input_source.cc index 23b15154..183658a9 100644 --- a/libtests/closed_file_input_source.cc +++ b/libtests/closed_file_input_source.cc @@ -2,7 +2,7 @@ #include #include -#include +#include void check(std::string const& what, bool result) diff --git a/libtests/dct_compress.cc b/libtests/dct_compress.cc index ad8710b1..2f12aea7 100644 --- a/libtests/dct_compress.cc +++ b/libtests/dct_compress.cc @@ -3,9 +3,9 @@ #include #include -#include -#include -#include +#include +#include +#include static void usage() diff --git a/libtests/dct_uncompress.cc b/libtests/dct_uncompress.cc index 5e1e9a33..6606e4a5 100644 --- a/libtests/dct_uncompress.cc +++ b/libtests/dct_uncompress.cc @@ -3,8 +3,8 @@ #include #include -#include -#include +#include +#include int main(int argc, char* argv[]) diff --git a/libtests/flate.cc b/libtests/flate.cc index 1170841b..93c41f85 100644 --- a/libtests/flate.cc +++ b/libtests/flate.cc @@ -5,7 +5,7 @@ #include #include -#include +#include void run(char const* filename) diff --git a/libtests/hex.cc b/libtests/hex.cc index 9e708204..d239d202 100644 --- a/libtests/hex.cc +++ b/libtests/hex.cc @@ -2,7 +2,7 @@ #include #include -#include +#include int main() diff --git a/libtests/lzw.cc b/libtests/lzw.cc index 788d3dfc..412ce4c5 100644 --- a/libtests/lzw.cc +++ b/libtests/lzw.cc @@ -3,8 +3,8 @@ #include #include #include -#include -#include +#include +#include int main(int argc, char* argv[]) diff --git a/libtests/md5.cc b/libtests/md5.cc index 0fe4205e..27aaad51 100644 --- a/libtests/md5.cc +++ b/libtests/md5.cc @@ -3,7 +3,7 @@ #include #include #include -#include +#include static void test_string(char const* str) diff --git a/libtests/predictors.cc b/libtests/predictors.cc index f0bde79a..fd1cc2ad 100644 --- a/libtests/predictors.cc +++ b/libtests/predictors.cc @@ -7,8 +7,8 @@ #include #include -#include -#include +#include +#include void run(char const* filename, diff --git a/libtests/qintc.cc b/libtests/qintc.cc index f6c15f00..0cf3924f 100644 --- a/libtests/qintc.cc +++ b/libtests/qintc.cc @@ -1,7 +1,7 @@ #include #include -#include +#include #define try_convert(exp_pass, fn, i) \ try_convert_real(#fn "(" #i ")", exp_pass, fn, i) diff --git a/libtests/qutil.cc b/libtests/qutil.cc index b9012db9..a6f1282a 100644 --- a/libtests/qutil.cc +++ b/libtests/qutil.cc @@ -5,9 +5,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #ifdef _WIN32 # include diff --git a/libtests/rc4.cc b/libtests/rc4.cc index a6a1328e..874c11ff 100644 --- a/libtests/rc4.cc +++ b/libtests/rc4.cc @@ -6,9 +6,9 @@ #include #include -#include -#include -#include +#include +#include +#include static void other_tests() diff --git a/libtests/runlength.cc b/libtests/runlength.cc index 456e33a2..260ce5cb 100644 --- a/libtests/runlength.cc +++ b/libtests/runlength.cc @@ -3,9 +3,9 @@ #include #include -#include -#include -#include +#include +#include +#include int main(int argc, char* argv[]) diff --git a/libtests/sha2.cc b/libtests/sha2.cc index 46ccd5c2..4be8956a 100644 --- a/libtests/sha2.cc +++ b/libtests/sha2.cc @@ -1,7 +1,7 @@ #include #include #include -#include +#include static void test( diff --git a/qpdf/pdf_from_scratch.cc b/qpdf/pdf_from_scratch.cc index 4e1c6553..1b172964 100644 --- a/qpdf/pdf_from_scratch.cc +++ b/qpdf/pdf_from_scratch.cc @@ -5,9 +5,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include static char const* whoami = 0; diff --git a/qpdf/test_driver.cc b/qpdf/test_driver.cc index 39631d21..673c6b58 100644 --- a/qpdf/test_driver.cc +++ b/qpdf/test_driver.cc @@ -27,12 +27,12 @@ #include #include #include -#include +#include #include #include -#include -#include -#include +#include +#include +#include #define QPDF_OBJECT_NOWARN #include diff --git a/qpdf/test_large_file.cc b/qpdf/test_large_file.cc index e8bea103..b30967c7 100644 --- a/qpdf/test_large_file.cc +++ b/qpdf/test_large_file.cc @@ -13,8 +13,8 @@ #include #include #include -#include -#include +#include +#include // Run "test_large_file write small a.pdf" to get a PDF file that you // can look at in a reader. diff --git a/qpdf/test_pdf_doc_encoding.cc b/qpdf/test_pdf_doc_encoding.cc index 5c67f59a..cd2e9b42 100644 --- a/qpdf/test_pdf_doc_encoding.cc +++ b/qpdf/test_pdf_doc_encoding.cc @@ -1,8 +1,8 @@ #include #include #include -#include -#include +#include +#include static char const* whoami = 0; diff --git a/qpdf/test_pdf_unicode.cc b/qpdf/test_pdf_unicode.cc index 38df6daa..b28edeaf 100644 --- a/qpdf/test_pdf_unicode.cc +++ b/qpdf/test_pdf_unicode.cc @@ -1,8 +1,8 @@ #include #include #include -#include -#include +#include +#include static char const* whoami = 0; diff --git a/qpdf/test_tokenizer.cc b/qpdf/test_tokenizer.cc index 83d3e1c8..8a58fc8e 100644 --- a/qpdf/test_tokenizer.cc +++ b/qpdf/test_tokenizer.cc @@ -7,9 +7,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include static char const* whoami = 0; diff --git a/qpdf/test_unicode_filenames.cc b/qpdf/test_unicode_filenames.cc index 3d9e8038..b2fd50f3 100644 --- a/qpdf/test_unicode_filenames.cc +++ b/qpdf/test_unicode_filenames.cc @@ -6,8 +6,8 @@ #endif #include -#include -#include +#include +#include static void do_copy(FILE* in, FILE* out) diff --git a/zlib-flate/zlib-flate.cc b/zlib-flate/zlib-flate.cc index f7d0c807..8f0f087a 100644 --- a/zlib-flate/zlib-flate.cc +++ b/zlib-flate/zlib-flate.cc @@ -5,9 +5,9 @@ #include #include -#include -#include -#include +#include +#include +#include static char const* whoami = 0; -- cgit v1.2.3-70-g09d2 From 2fa581537b068e5ddcaee68fd7b92e290fc5fc53 Mon Sep 17 00:00:00 2001 From: m-holger Date: Sat, 20 May 2023 13:34:53 +0100 Subject: Use auto when initializing with a cast --- libqpdf/InsecureRandomDataProvider.cc | 2 +- libqpdf/JSON.cc | 14 +++++++------- libqpdf/Pl_ASCIIHexDecoder.cc | 2 +- libqpdf/Pl_DCT.cc | 12 ++++++------ libqpdf/Pl_LZWDecoder.cc | 2 +- libqpdf/Pl_RunLength.cc | 4 ++-- libqpdf/QPDFFormFieldObjectHelper.cc | 2 +- libqpdf/QPDF_Stream.cc | 2 +- libqpdf/QPDF_optimization.cc | 2 +- libtests/qintc.cc | 2 +- 10 files changed, 22 insertions(+), 22 deletions(-) (limited to 'libqpdf/Pl_ASCIIHexDecoder.cc') diff --git a/libqpdf/InsecureRandomDataProvider.cc b/libqpdf/InsecureRandomDataProvider.cc index 90a548ee..ed62d6c7 100644 --- a/libqpdf/InsecureRandomDataProvider.cc +++ b/libqpdf/InsecureRandomDataProvider.cc @@ -24,7 +24,7 @@ InsecureRandomDataProvider::random() // Seed the random number generator with something simple, but // just to be interesting, don't use the unmodified current // time. It would be better if this were a more secure seed. - unsigned int seed = + auto seed = static_cast(QUtil::get_current_time() ^ 0xcccc); #ifdef HAVE_RANDOM ::srandom(seed); diff --git a/libqpdf/JSON.cc b/libqpdf/JSON.cc index fbf06f88..5f76f1ec 100644 --- a/libqpdf/JSON.cc +++ b/libqpdf/JSON.cc @@ -294,7 +294,7 @@ JSON::addDictionaryMember(std::string const& key, JSON const& val) bool JSON::checkDictionaryKeySeen(std::string const& key) { - JSON_dictionary* obj = dynamic_cast(this->m->value.get()); + auto* obj = dynamic_cast(this->m->value.get()); if (nullptr == obj) { throw std::logic_error( "JSON::checkDictionaryKey called on non-dictionary"); @@ -315,7 +315,7 @@ JSON::makeArray() JSON JSON::addArrayElement(JSON const& val) { - JSON_array* arr = dynamic_cast(this->m->value.get()); + auto* arr = dynamic_cast(this->m->value.get()); if (nullptr == arr) { throw std::runtime_error("JSON::addArrayElement called on non-array"); } @@ -470,13 +470,13 @@ JSON::checkSchemaInternal( std::list& errors, std::string prefix) { - JSON_array* this_arr = dynamic_cast(this_v); - JSON_dictionary* this_dict = dynamic_cast(this_v); + auto* this_arr = dynamic_cast(this_v); + auto* this_dict = dynamic_cast(this_v); - JSON_array* sch_arr = dynamic_cast(sch_v); - JSON_dictionary* sch_dict = dynamic_cast(sch_v); + auto* sch_arr = dynamic_cast(sch_v); + auto* sch_dict = dynamic_cast(sch_v); - JSON_string* sch_str = dynamic_cast(sch_v); + auto* sch_str = dynamic_cast(sch_v); std::string err_prefix; if (prefix.empty()) { diff --git a/libqpdf/Pl_ASCIIHexDecoder.cc b/libqpdf/Pl_ASCIIHexDecoder.cc index 5590efba..3548f33e 100644 --- a/libqpdf/Pl_ASCIIHexDecoder.cc +++ b/libqpdf/Pl_ASCIIHexDecoder.cc @@ -76,7 +76,7 @@ Pl_ASCIIHexDecoder::flush() b[i] = this->inbuf[i] - '0'; } } - unsigned char ch = static_cast((b[0] << 4) + b[1]); + auto ch = static_cast((b[0] << 4) + b[1]); QTC::TC( "libtests", diff --git a/libqpdf/Pl_DCT.cc b/libqpdf/Pl_DCT.cc index c01398ad..299b48b1 100644 --- a/libqpdf/Pl_DCT.cc +++ b/libqpdf/Pl_DCT.cc @@ -24,7 +24,7 @@ namespace static void error_handler(j_common_ptr cinfo) { - qpdf_jpeg_error_mgr* jerr = + auto* jerr = reinterpret_cast(cinfo->err); char buf[JMSG_LENGTH_MAX]; (*cinfo->err->format_message)(cinfo, buf); @@ -167,7 +167,7 @@ static boolean empty_pipeline_output_buffer(j_compress_ptr cinfo) { QTC::TC("libtests", "Pl_DCT empty_pipeline_output_buffer"); - dct_pipeline_dest* dest = reinterpret_cast(cinfo->dest); + auto* dest = reinterpret_cast(cinfo->dest); dest->next->write(dest->buffer, dest->size); dest->pub.next_output_byte = dest->buffer; dest->pub.free_in_buffer = dest->size; @@ -178,7 +178,7 @@ static void term_pipeline_destination(j_compress_ptr cinfo) { QTC::TC("libtests", "Pl_DCT term_pipeline_destination"); - dct_pipeline_dest* dest = reinterpret_cast(cinfo->dest); + auto* dest = reinterpret_cast(cinfo->dest); dest->next->write(dest->buffer, dest->size - dest->pub.free_in_buffer); } @@ -192,7 +192,7 @@ jpeg_pipeline_dest( reinterpret_cast(cinfo), JPOOL_PERMANENT, sizeof(dct_pipeline_dest))); - dct_pipeline_dest* dest = reinterpret_cast(cinfo->dest); + auto* dest = reinterpret_cast(cinfo->dest); dest->pub.init_destination = init_pipeline_destination; dest->pub.empty_output_buffer = empty_pipeline_output_buffer; dest->pub.term_destination = term_pipeline_destination; @@ -261,7 +261,7 @@ jpeg_buffer_src(j_decompress_ptr cinfo, Buffer* buffer) void Pl_DCT::compress(void* cinfo_p, Buffer* b) { - struct jpeg_compress_struct* cinfo = + auto* cinfo = reinterpret_cast(cinfo_p); #if ( \ @@ -316,7 +316,7 @@ Pl_DCT::compress(void* cinfo_p, Buffer* b) void Pl_DCT::decompress(void* cinfo_p, Buffer* b) { - struct jpeg_decompress_struct* cinfo = + auto* cinfo = reinterpret_cast(cinfo_p); #if ( \ diff --git a/libqpdf/Pl_LZWDecoder.cc b/libqpdf/Pl_LZWDecoder.cc index 1c2d6807..3356ea4f 100644 --- a/libqpdf/Pl_LZWDecoder.cc +++ b/libqpdf/Pl_LZWDecoder.cc @@ -189,7 +189,7 @@ Pl_LZWDecoder::handleCode(unsigned int code) } if (code < 256) { - unsigned char ch = static_cast(code); + auto ch = static_cast(code); getNext()->write(&ch, 1); } else { unsigned int idx = code - 258; diff --git a/libqpdf/Pl_RunLength.cc b/libqpdf/Pl_RunLength.cc index 786e2e86..d60da70a 100644 --- a/libqpdf/Pl_RunLength.cc +++ b/libqpdf/Pl_RunLength.cc @@ -127,11 +127,11 @@ Pl_RunLength::flush_encode() throw std::logic_error( "Pl_RunLength: invalid length in flush_encode for run"); } - unsigned char ch = static_cast(257 - this->m->length); + auto ch = static_cast(257 - this->m->length); this->getNext()->write(&ch, 1); this->getNext()->write(&this->m->buf[0], 1); } else if (this->m->length > 0) { - unsigned char ch = static_cast(this->m->length - 1); + auto ch = static_cast(this->m->length - 1); this->getNext()->write(&ch, 1); this->getNext()->write(this->m->buf, this->m->length); } diff --git a/libqpdf/QPDFFormFieldObjectHelper.cc b/libqpdf/QPDFFormFieldObjectHelper.cc index 93dc0e63..7712cab2 100644 --- a/libqpdf/QPDFFormFieldObjectHelper.cc +++ b/libqpdf/QPDFFormFieldObjectHelper.cc @@ -611,7 +611,7 @@ ValueSetter::writeAppearance() // Write one or more lines, centered vertically, possibly with // one row highlighted. - size_t max_rows = static_cast((bbox.ury - bbox.lly) / tfh); + auto max_rows = static_cast((bbox.ury - bbox.lly) / tfh); bool highlight = false; size_t highlight_idx = 0; diff --git a/libqpdf/QPDF_Stream.cc b/libqpdf/QPDF_Stream.cc index 8e2e16c5..4ceeab48 100644 --- a/libqpdf/QPDF_Stream.cc +++ b/libqpdf/QPDF_Stream.cc @@ -557,7 +557,7 @@ QPDF_Stream::pipeStreamData( if (decode_pipeline) { pipeline = decode_pipeline; } - Pl_Flate* flate = dynamic_cast(pipeline); + auto* flate = dynamic_cast(pipeline); if (flate != nullptr) { flate->setWarnCallback( [this](char const* msg, int code) { warn(msg); }); diff --git a/libqpdf/QPDF_optimization.cc b/libqpdf/QPDF_optimization.cc index 41204fbd..9130287a 100644 --- a/libqpdf/QPDF_optimization.cc +++ b/libqpdf/QPDF_optimization.cc @@ -115,7 +115,7 @@ QPDF::optimize( } ObjUser root_ou = ObjUser(ObjUser::ou_root); - QPDFObjGen root_og = QPDFObjGen(root.getObjGen()); + auto root_og = QPDFObjGen(root.getObjGen()); this->m->obj_user_to_objects[root_ou].insert(root_og); this->m->object_to_obj_users[root_og].insert(root_ou); diff --git a/libtests/qintc.cc b/libtests/qintc.cc index 0cf3924f..5b985644 100644 --- a/libtests/qintc.cc +++ b/libtests/qintc.cc @@ -74,7 +74,7 @@ main() uint64_t ul1 = 1099511627776LL; // Too big for 32-bit uint64_t ul2 = 12345; // Fits into 32-bit int32_t i2 = 81; // Fits in char and uchar - signed char c1 = static_cast('\xf7'); // Signed value when char + auto c1 = static_cast('\xf7'); // Signed value when char char c2 = 'W'; // char; may be signed or unsigned // Verify i1 and u1 have same bit pattern -- cgit v1.2.3-70-g09d2