diff options
Diffstat (limited to 'libqpdf')
| -rw-r--r-- | libqpdf/BufferInputSource.cc | 2 | ||||
| -rw-r--r-- | libqpdf/InputSource.cc | 2 | ||||
| -rw-r--r-- | libqpdf/Pl_ASCII85Decoder.cc | 2 | ||||
| -rw-r--r-- | libqpdf/Pl_Buffer.cc | 2 | ||||
| -rw-r--r-- | libqpdf/Pl_DCT.cc | 9 | ||||
| -rw-r--r-- | libqpdf/Pl_LZWDecoder.cc | 2 | ||||
| -rw-r--r-- | libqpdf/Pl_PNGFilter.cc | 2 | ||||
| -rw-r--r-- | libqpdf/Pl_TIFFPredictor.cc | 2 | ||||
| -rw-r--r-- | libqpdf/QPDFJob.cc | 2 | ||||
| -rw-r--r-- | libqpdf/QPDFJob_argv.cc | 6 | ||||
| -rw-r--r-- | libqpdf/QPDFObjectHandle.cc | 4 | ||||
| -rw-r--r-- | libqpdf/QPDFTokenizer.cc | 2 | ||||
| -rw-r--r-- | libqpdf/QPDFWriter.cc | 5 | ||||
| -rw-r--r-- | libqpdf/QPDF_json.cc | 3 | ||||
| -rw-r--r-- | libqpdf/QTC.cc | 2 | ||||
| -rw-r--r-- | libqpdf/QUtil.cc | 6 | ||||
| -rw-r--r-- | libqpdf/RC4.cc | 1 |
17 files changed, 24 insertions, 30 deletions
diff --git a/libqpdf/BufferInputSource.cc b/libqpdf/BufferInputSource.cc index 33ab44f6..4fff642a 100644 --- a/libqpdf/BufferInputSource.cc +++ b/libqpdf/BufferInputSource.cc @@ -2,8 +2,8 @@ #include <qpdf/QIntC.hh> #include <algorithm> -#include <sstream> #include <cstring> +#include <sstream> BufferInputSource::BufferInputSource( std::string const& description, Buffer* buf, bool own_memory) : diff --git a/libqpdf/InputSource.cc b/libqpdf/InputSource.cc index 3a4bb88a..acb459d9 100644 --- a/libqpdf/InputSource.cc +++ b/libqpdf/InputSource.cc @@ -2,8 +2,8 @@ #include <qpdf/QIntC.hh> #include <qpdf/QTC.hh> -#include <stdexcept> #include <cstring> +#include <stdexcept> void InputSource::setLastOffset(qpdf_offset_t offset) diff --git a/libqpdf/Pl_ASCII85Decoder.cc b/libqpdf/Pl_ASCII85Decoder.cc index e43b4a86..6280c362 100644 --- a/libqpdf/Pl_ASCII85Decoder.cc +++ b/libqpdf/Pl_ASCII85Decoder.cc @@ -1,8 +1,8 @@ #include <qpdf/Pl_ASCII85Decoder.hh> #include <qpdf/QTC.hh> -#include <stdexcept> #include <cstring> +#include <stdexcept> Pl_ASCII85Decoder::Pl_ASCII85Decoder(char const* identifier, Pipeline* next) : Pipeline(identifier, next), diff --git a/libqpdf/Pl_Buffer.cc b/libqpdf/Pl_Buffer.cc index ff200643..639bff1a 100644 --- a/libqpdf/Pl_Buffer.cc +++ b/libqpdf/Pl_Buffer.cc @@ -1,9 +1,9 @@ #include <qpdf/Pl_Buffer.hh> #include <algorithm> -#include <stdexcept> #include <cstdlib> #include <cstring> +#include <stdexcept> 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 299b48b1..c9a43c06 100644 --- a/libqpdf/Pl_DCT.cc +++ b/libqpdf/Pl_DCT.cc @@ -24,8 +24,7 @@ namespace static void error_handler(j_common_ptr cinfo) { - auto* jerr = - reinterpret_cast<qpdf_jpeg_error_mgr*>(cinfo->err); + auto* jerr = reinterpret_cast<qpdf_jpeg_error_mgr*>(cinfo->err); char buf[JMSG_LENGTH_MAX]; (*cinfo->err->format_message)(cinfo, buf); jerr->msg = buf; @@ -261,8 +260,7 @@ jpeg_buffer_src(j_decompress_ptr cinfo, Buffer* buffer) void Pl_DCT::compress(void* cinfo_p, Buffer* b) { - auto* cinfo = - reinterpret_cast<jpeg_compress_struct*>(cinfo_p); + auto* cinfo = reinterpret_cast<jpeg_compress_struct*>(cinfo_p); #if ( \ (defined(__GNUC__) && ((__GNUC__ * 100) + __GNUC_MINOR__) >= 406) || \ @@ -316,8 +314,7 @@ Pl_DCT::compress(void* cinfo_p, Buffer* b) void Pl_DCT::decompress(void* cinfo_p, Buffer* b) { - auto* cinfo = - reinterpret_cast<jpeg_decompress_struct*>(cinfo_p); + auto* cinfo = reinterpret_cast<jpeg_decompress_struct*>(cinfo_p); #if ( \ (defined(__GNUC__) && ((__GNUC__ * 100) + __GNUC_MINOR__) >= 406) || \ diff --git a/libqpdf/Pl_LZWDecoder.cc b/libqpdf/Pl_LZWDecoder.cc index 3356ea4f..aa9257fb 100644 --- a/libqpdf/Pl_LZWDecoder.cc +++ b/libqpdf/Pl_LZWDecoder.cc @@ -3,8 +3,8 @@ #include <qpdf/QIntC.hh> #include <qpdf/QTC.hh> #include <qpdf/QUtil.hh> -#include <stdexcept> #include <cstring> +#include <stdexcept> 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 41088e1a..31ef3cc8 100644 --- a/libqpdf/Pl_PNGFilter.cc +++ b/libqpdf/Pl_PNGFilter.cc @@ -4,8 +4,8 @@ #include <qpdf/QUtil.hh> #include <climits> -#include <stdexcept> #include <cstring> +#include <stdexcept> static int abs_diff(int a, int b) diff --git a/libqpdf/Pl_TIFFPredictor.cc b/libqpdf/Pl_TIFFPredictor.cc index 45b6d396..ad620f62 100644 --- a/libqpdf/Pl_TIFFPredictor.cc +++ b/libqpdf/Pl_TIFFPredictor.cc @@ -6,8 +6,8 @@ #include <qpdf/QUtil.hh> #include <climits> -#include <stdexcept> #include <cstring> +#include <stdexcept> #include <vector> Pl_TIFFPredictor::Pl_TIFFPredictor( diff --git a/libqpdf/QPDFJob.cc b/libqpdf/QPDFJob.cc index 5012d9b5..2cdc4711 100644 --- a/libqpdf/QPDFJob.cc +++ b/libqpdf/QPDFJob.cc @@ -1,9 +1,9 @@ #include <qpdf/QPDFJob.hh> +#include <cctype> #include <cstdio> #include <cstdlib> #include <cstring> -#include <cctype> #include <fcntl.h> #include <iostream> #include <memory> diff --git a/libqpdf/QPDFJob_argv.cc b/libqpdf/QPDFJob_argv.cc index 5534cd39..a95cd415 100644 --- a/libqpdf/QPDFJob_argv.cc +++ b/libqpdf/QPDFJob_argv.cc @@ -2,13 +2,13 @@ // See "HOW TO ADD A COMMAND-LINE ARGUMENT" in README-maintainer. -#include <cstdio> #include <cctype> +#include <cstdio> +#include <cstdlib> +#include <cstring> #include <iostream> #include <memory> #include <sstream> -#include <cstdlib> -#include <cstring> #include <qpdf/QIntC.hh> #include <qpdf/QPDFArgParser.hh> diff --git a/libqpdf/QPDFObjectHandle.cc b/libqpdf/QPDFObjectHandle.cc index 1689cd40..70926267 100644 --- a/libqpdf/QPDFObjectHandle.cc +++ b/libqpdf/QPDFObjectHandle.cc @@ -29,11 +29,11 @@ #include <qpdf/QUtil.hh> #include <algorithm> -#include <cstring> #include <cctype> #include <climits> -#include <stdexcept> #include <cstdlib> +#include <cstring> +#include <stdexcept> using namespace std::literals; diff --git a/libqpdf/QPDFTokenizer.cc b/libqpdf/QPDFTokenizer.cc index 1a14e3a9..d2c66e29 100644 --- a/libqpdf/QPDFTokenizer.cc +++ b/libqpdf/QPDFTokenizer.cc @@ -10,9 +10,9 @@ #include <qpdf/QTC.hh> #include <qpdf/QUtil.hh> -#include <stdexcept> #include <cstdlib> #include <cstring> +#include <stdexcept> static inline bool is_delimiter(char ch) diff --git a/libqpdf/QPDFWriter.cc b/libqpdf/QPDFWriter.cc index a5a54cc7..99ff7c87 100644 --- a/libqpdf/QPDFWriter.cc +++ b/libqpdf/QPDFWriter.cc @@ -23,8 +23,8 @@ #include <qpdf/RC4.hh> #include <algorithm> -#include <stdexcept> #include <cstdlib> +#include <stdexcept> QPDFWriter::ProgressReporter::~ProgressReporter() { @@ -997,8 +997,7 @@ void QPDFWriter::activatePipelineStack(PipelinePopper& pp) { std::string stack_id("stack " + std::to_string(this->m->next_stack_id)); - auto* c = - new Pl_Count(stack_id.c_str(), this->m->pipeline_stack.back()); + auto* c = new Pl_Count(stack_id.c_str(), this->m->pipeline_stack.back()); ++this->m->next_stack_id; this->m->pipeline_stack.push_back(c); this->m->pipeline = c; diff --git a/libqpdf/QPDF_json.cc b/libqpdf/QPDF_json.cc index 9e3cb3bb..3a05ae5c 100644 --- a/libqpdf/QPDF_json.cc +++ b/libqpdf/QPDF_json.cc @@ -246,8 +246,7 @@ class QPDF::JSONReactor: public JSON::Reactor void arrayStart() override; void containerEnd(JSON const& value) override; void topLevelScalar() override; - bool - dictionaryItem(std::string const& key, JSON const& value) override; + bool dictionaryItem(std::string const& key, JSON const& value) override; bool arrayItem(JSON const& value) override; bool anyErrors() const; diff --git a/libqpdf/QTC.cc b/libqpdf/QTC.cc index e537a0e1..ae9649a5 100644 --- a/libqpdf/QTC.cc +++ b/libqpdf/QTC.cc @@ -1,9 +1,9 @@ #include <qpdf/QTC.hh> #include <qpdf/QUtil.hh> +#include <cstdio> #include <map> #include <set> -#include <cstdio> static bool tc_active(char const* const scope) diff --git a/libqpdf/QUtil.cc b/libqpdf/QUtil.cc index a542736d..57999185 100644 --- a/libqpdf/QUtil.cc +++ b/libqpdf/QUtil.cc @@ -11,6 +11,9 @@ #include <cctype> #include <cerrno> +#include <cstdio> +#include <cstdlib> +#include <cstring> #include <fcntl.h> #include <fstream> #include <iomanip> @@ -21,9 +24,6 @@ #include <set> #include <sstream> #include <stdexcept> -#include <cstdio> -#include <cstdlib> -#include <cstring> #ifndef QPDF_NO_WCHAR_T # include <cwchar> #endif diff --git a/libqpdf/RC4.cc b/libqpdf/RC4.cc index 2d1b783d..c903fc16 100644 --- a/libqpdf/RC4.cc +++ b/libqpdf/RC4.cc @@ -2,7 +2,6 @@ #include <qpdf/QPDFCryptoProvider.hh> - RC4::RC4(unsigned char const* key_data, int key_len) : crypto(QPDFCryptoProvider::getImpl()) { |