diff options
Diffstat (limited to 'libqpdf')
74 files changed, 177 insertions, 216 deletions
diff --git a/libqpdf/BufferInputSource.cc b/libqpdf/BufferInputSource.cc index 6402f639..33ab44f6 100644 --- a/libqpdf/BufferInputSource.cc +++ b/libqpdf/BufferInputSource.cc @@ -2,10 +2,8 @@ #include <qpdf/QIntC.hh> #include <algorithm> -#include <limits> #include <sstream> -#include <stdexcept> -#include <string.h> +#include <cstring> 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 <qpdf/QPDFExc.hh> #include <qpdf/QUtil.hh> #include <algorithm> -#include <string.h> +#include <cstring> 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 <qpdf/QIntC.hh> #include <qpdf/QTC.hh> #include <stdexcept> -#include <string.h> +#include <cstring> void InputSource::setLastOffset(qpdf_offset_t offset) diff --git a/libqpdf/InsecureRandomDataProvider.cc b/libqpdf/InsecureRandomDataProvider.cc index cb67cada..ed62d6c7 100644 --- a/libqpdf/InsecureRandomDataProvider.cc +++ b/libqpdf/InsecureRandomDataProvider.cc @@ -2,7 +2,7 @@ #include <qpdf/QUtil.hh> #include <qpdf/qpdf-config.h> -#include <stdlib.h> +#include <cstdlib> InsecureRandomDataProvider::InsecureRandomDataProvider() : seeded_random(false) @@ -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<unsigned int>(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<JSON_dictionary*>(this->m->value.get()); + auto* obj = dynamic_cast<JSON_dictionary*>(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<JSON_array*>(this->m->value.get()); + auto* arr = dynamic_cast<JSON_array*>(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<std::string>& errors, std::string prefix) { - JSON_array* this_arr = dynamic_cast<JSON_array*>(this_v); - JSON_dictionary* this_dict = dynamic_cast<JSON_dictionary*>(this_v); + auto* this_arr = dynamic_cast<JSON_array*>(this_v); + auto* this_dict = dynamic_cast<JSON_dictionary*>(this_v); - JSON_array* sch_arr = dynamic_cast<JSON_array*>(sch_v); - JSON_dictionary* sch_dict = dynamic_cast<JSON_dictionary*>(sch_v); + auto* sch_arr = dynamic_cast<JSON_array*>(sch_v); + auto* sch_dict = dynamic_cast<JSON_dictionary*>(sch_v); - JSON_string* sch_str = dynamic_cast<JSON_string*>(sch_v); + auto* sch_str = dynamic_cast<JSON_string*>(sch_v); std::string err_prefix; if (prefix.empty()) { diff --git a/libqpdf/MD5.cc b/libqpdf/MD5.cc index 2119349c..9668c982 100644 --- a/libqpdf/MD5.cc +++ b/libqpdf/MD5.cc @@ -4,11 +4,7 @@ #include <qpdf/QPDFCryptoProvider.hh> #include <qpdf/QUtil.hh> -#include <errno.h> -#include <memory.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> +#include <cstring> MD5::MD5() { diff --git a/libqpdf/Pipeline.cc b/libqpdf/Pipeline.cc index 3223ac7e..73bd1675 100644 --- a/libqpdf/Pipeline.cc +++ b/libqpdf/Pipeline.cc @@ -1,7 +1,5 @@ #include <qpdf/Pipeline.hh> -#include <qpdf/QUtil.hh> - #include <cstring> #include <stdexcept> diff --git a/libqpdf/Pl_AES_PDF.cc b/libqpdf/Pl_AES_PDF.cc index acb6b3f6..89bde7ce 100644 --- a/libqpdf/Pl_AES_PDF.cc +++ b/libqpdf/Pl_AES_PDF.cc @@ -5,7 +5,6 @@ #include <qpdf/QUtil.hh> #include <cstring> #include <stdexcept> -#include <stdlib.h> #include <string> bool Pl_AES_PDF::use_static_iv = false; 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 <qpdf/QTC.hh> #include <stdexcept> -#include <string.h> +#include <cstring> 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 f1c4785b..3548f33e 100644 --- a/libqpdf/Pl_ASCIIHexDecoder.cc +++ b/libqpdf/Pl_ASCIIHexDecoder.cc @@ -1,9 +1,8 @@ #include <qpdf/Pl_ASCIIHexDecoder.hh> #include <qpdf/QTC.hh> -#include <ctype.h> +#include <cctype> #include <stdexcept> -#include <string.h> Pl_ASCIIHexDecoder::Pl_ASCIIHexDecoder(char const* identifier, Pipeline* next) : Pipeline(identifier, next), @@ -77,7 +76,7 @@ Pl_ASCIIHexDecoder::flush() b[i] = this->inbuf[i] - '0'; } } - unsigned char ch = static_cast<unsigned char>((b[0] << 4) + b[1]); + auto ch = static_cast<unsigned char>((b[0] << 4) + b[1]); QTC::TC( "libtests", diff --git a/libqpdf/Pl_Base64.cc b/libqpdf/Pl_Base64.cc index 6fb422c1..af5ff0bb 100644 --- a/libqpdf/Pl_Base64.cc +++ b/libqpdf/Pl_Base64.cc @@ -2,7 +2,6 @@ #include <qpdf/QIntC.hh> #include <qpdf/QUtil.hh> -#include <algorithm> #include <cstring> #include <stdexcept> diff --git a/libqpdf/Pl_Buffer.cc b/libqpdf/Pl_Buffer.cc index ca29ef60..ff200643 100644 --- a/libqpdf/Pl_Buffer.cc +++ b/libqpdf/Pl_Buffer.cc @@ -2,8 +2,8 @@ #include <algorithm> #include <stdexcept> -#include <stdlib.h> -#include <string.h> +#include <cstdlib> +#include <cstring> Pl_Buffer::Pl_Buffer(char const* identifier, Pipeline* next) : Pipeline(identifier, next), @@ -45,7 +45,7 @@ Pl_Buffer::getBuffer() } auto size = this->m->data.length(); - Buffer* b = new Buffer(size); + auto* b = new Buffer(size); if (size > 0) { unsigned char* p = b->getBuffer(); memcpy(p, this->m->data.data(), size); diff --git a/libqpdf/Pl_DCT.cc b/libqpdf/Pl_DCT.cc index f7cc4b75..299b48b1 100644 --- a/libqpdf/Pl_DCT.cc +++ b/libqpdf/Pl_DCT.cc @@ -2,12 +2,9 @@ #include <qpdf/QIntC.hh> #include <qpdf/QTC.hh> -#include <qpdf/QUtil.hh> -#include <cstring> -#include <setjmp.h> +#include <csetjmp> #include <stdexcept> -#include <stdlib.h> #include <string> #if BITS_IN_JSAMPLE != 8 @@ -27,7 +24,7 @@ namespace static void error_handler(j_common_ptr cinfo) { - qpdf_jpeg_error_mgr* jerr = + auto* jerr = reinterpret_cast<qpdf_jpeg_error_mgr*>(cinfo->err); char buf[JMSG_LENGTH_MAX]; (*cinfo->err->format_message)(cinfo, buf); @@ -170,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<dct_pipeline_dest*>(cinfo->dest); + auto* dest = reinterpret_cast<dct_pipeline_dest*>(cinfo->dest); dest->next->write(dest->buffer, dest->size); dest->pub.next_output_byte = dest->buffer; dest->pub.free_in_buffer = dest->size; @@ -181,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<dct_pipeline_dest*>(cinfo->dest); + auto* dest = reinterpret_cast<dct_pipeline_dest*>(cinfo->dest); dest->next->write(dest->buffer, dest->size - dest->pub.free_in_buffer); } @@ -195,7 +192,7 @@ jpeg_pipeline_dest( reinterpret_cast<j_common_ptr>(cinfo), JPOOL_PERMANENT, sizeof(dct_pipeline_dest))); - dct_pipeline_dest* dest = reinterpret_cast<dct_pipeline_dest*>(cinfo->dest); + auto* dest = reinterpret_cast<dct_pipeline_dest*>(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; @@ -264,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<jpeg_compress_struct*>(cinfo_p); #if ( \ @@ -319,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<jpeg_decompress_struct*>(cinfo_p); #if ( \ 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 <qpdf/Pl_Flate.hh> -#include <limits.h> -#include <string.h> +#include <climits> +#include <cstring> #include <zlib.h> #include <qpdf/QIntC.hh> diff --git a/libqpdf/Pl_Function.cc b/libqpdf/Pl_Function.cc index 853b4212..26551ac8 100644 --- a/libqpdf/Pl_Function.cc +++ b/libqpdf/Pl_Function.cc @@ -1,7 +1,5 @@ #include <qpdf/Pl_Function.hh> -#include <qpdf/QUtil.hh> -#include <errno.h> #include <stdexcept> Pl_Function::Members::Members(writer_t fn) : diff --git a/libqpdf/Pl_LZWDecoder.cc b/libqpdf/Pl_LZWDecoder.cc index 000fb64b..3356ea4f 100644 --- a/libqpdf/Pl_LZWDecoder.cc +++ b/libqpdf/Pl_LZWDecoder.cc @@ -4,7 +4,7 @@ #include <qpdf/QTC.hh> #include <qpdf/QUtil.hh> #include <stdexcept> -#include <string.h> +#include <cstring> Pl_LZWDecoder::Pl_LZWDecoder( char const* identifier, Pipeline* next, bool early_code_change) : @@ -189,7 +189,7 @@ Pl_LZWDecoder::handleCode(unsigned int code) } if (code < 256) { - unsigned char ch = static_cast<unsigned char>(code); + auto ch = static_cast<unsigned char>(code); getNext()->write(&ch, 1); } else { unsigned int idx = code - 258; diff --git a/libqpdf/Pl_OStream.cc b/libqpdf/Pl_OStream.cc index 137b6654..c9d4b1e6 100644 --- a/libqpdf/Pl_OStream.cc +++ b/libqpdf/Pl_OStream.cc @@ -1,7 +1,5 @@ #include <qpdf/Pl_OStream.hh> -#include <qpdf/QUtil.hh> -#include <errno.h> #include <stdexcept> Pl_OStream::Members::Members(std::ostream& os) : 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 <qpdf/QTC.hh> #include <qpdf/QUtil.hh> -#include <limits.h> +#include <climits> #include <stdexcept> -#include <string.h> +#include <cstring> static int abs_diff(int a, int b) diff --git a/libqpdf/Pl_QPDFTokenizer.cc b/libqpdf/Pl_QPDFTokenizer.cc index 5e42d579..b5c3f75e 100644 --- a/libqpdf/Pl_QPDFTokenizer.cc +++ b/libqpdf/Pl_QPDFTokenizer.cc @@ -2,9 +2,7 @@ #include <qpdf/BufferInputSource.hh> #include <qpdf/QTC.hh> -#include <qpdf/QUtil.hh> #include <stdexcept> -#include <string.h> Pl_QPDFTokenizer::Members::Members() : filter(nullptr), 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<unsigned char>(257 - this->m->length); + auto ch = static_cast<unsigned char>(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<unsigned char>(this->m->length - 1); + auto ch = static_cast<unsigned char>(this->m->length - 1); this->getNext()->write(&ch, 1); this->getNext()->write(this->m->buf, this->m->length); } diff --git a/libqpdf/Pl_SHA2.cc b/libqpdf/Pl_SHA2.cc index c54bd7ee..852e5db7 100644 --- a/libqpdf/Pl_SHA2.cc +++ b/libqpdf/Pl_SHA2.cc @@ -2,7 +2,6 @@ #include <qpdf/QPDFCryptoProvider.hh> #include <qpdf/QUtil.hh> -#include <cstdio> #include <stdexcept> Pl_SHA2::Pl_SHA2(int bits, Pipeline* next) : 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 <qpdf/Pl_StdioFile.hh> #include <qpdf/QUtil.hh> -#include <errno.h> +#include <cerrno> #include <stdexcept> Pl_StdioFile::Members::Members(FILE* f) : diff --git a/libqpdf/Pl_String.cc b/libqpdf/Pl_String.cc index d946a652..9b57ac2d 100644 --- a/libqpdf/Pl_String.cc +++ b/libqpdf/Pl_String.cc @@ -1,7 +1,5 @@ #include <qpdf/Pl_String.hh> -#include <qpdf/QUtil.hh> -#include <errno.h> #include <stdexcept> Pl_String::Members::Members(std::string& s) : 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 <qpdf/QTC.hh> #include <qpdf/QUtil.hh> -#include <limits.h> +#include <climits> #include <stdexcept> -#include <string.h> +#include <cstring> #include <vector> Pl_TIFFPredictor::Pl_TIFFPredictor( diff --git a/libqpdf/QPDF.cc b/libqpdf/QPDF.cc index c7cc1370..09221394 100644 --- a/libqpdf/QPDF.cc +++ b/libqpdf/QPDF.cc @@ -9,8 +9,8 @@ #include <memory.h> #include <regex> #include <sstream> -#include <stdlib.h> -#include <string.h> +#include <cstdlib> +#include <cstring> #include <vector> #include <qpdf/BufferInputSource.hh> @@ -60,42 +60,42 @@ namespace class InvalidInputSource: public InputSource { public: - virtual ~InvalidInputSource() = default; - virtual qpdf_offset_t + ~InvalidInputSource() override = default; + qpdf_offset_t findAndSkipNextEOL() override { throwException(); return 0; } - virtual std::string const& + std::string const& getName() const override { static std::string name("closed input source"); return name; } - virtual qpdf_offset_t + qpdf_offset_t tell() override { throwException(); return 0; } - virtual void + void seek(qpdf_offset_t offset, int whence) override { throwException(); } - virtual void + void rewind() override { throwException(); } - virtual size_t + size_t read(char* buffer, size_t length) override { throwException(); return 0; } - virtual void + void unreadCh(char ch) override { throwException(); @@ -264,7 +264,7 @@ QPDF::create() void QPDF::processFile(char const* filename, char const* password) { - FileInputSource* fi = new FileInputSource(filename); + auto* fi = new FileInputSource(filename); processInputSource(std::shared_ptr<InputSource>(fi), password); } @@ -272,7 +272,7 @@ void QPDF::processFile( char const* description, FILE* filep, bool close_file, char const* password) { - FileInputSource* fi = new FileInputSource(description, filep, close_file); + auto* fi = new FileInputSource(description, filep, close_file); processInputSource(std::shared_ptr<InputSource>(fi), password); } @@ -2537,7 +2537,7 @@ QPDF::getCompressibleObjGens() if (obj.isStream()) { QPDFObjectHandle dict = obj.getDict(); std::set<std::string> keys = dict.getKeys(); - for (std::set<std::string>::reverse_iterator iter = keys.rbegin(); + for (auto iter = keys.rbegin(); iter != keys.rend(); ++iter) { std::string const& key = *iter; @@ -2553,7 +2553,7 @@ QPDF::getCompressibleObjGens() } } else if (obj.isDictionary()) { std::set<std::string> keys = obj.getKeys(); - for (std::set<std::string>::reverse_iterator iter = keys.rbegin(); + for (auto iter = keys.rbegin(); iter != keys.rend(); ++iter) { queue.push_front(obj.getKey(*iter)); diff --git a/libqpdf/QPDFAnnotationObjectHelper.cc b/libqpdf/QPDFAnnotationObjectHelper.cc index f22207de..c14d98f9 100644 --- a/libqpdf/QPDFAnnotationObjectHelper.cc +++ b/libqpdf/QPDFAnnotationObjectHelper.cc @@ -2,7 +2,6 @@ #include <qpdf/QPDF.hh> #include <qpdf/QPDFMatrix.hh> -#include <qpdf/QPDFNameTreeObjectHelper.hh> #include <qpdf/QTC.hh> #include <qpdf/QUtil.hh> diff --git a/libqpdf/QPDFExc.cc b/libqpdf/QPDFExc.cc index 6f1ef1a0..87fad72a 100644 --- a/libqpdf/QPDFExc.cc +++ b/libqpdf/QPDFExc.cc @@ -1,7 +1,5 @@ #include <qpdf/QPDFExc.hh> -#include <qpdf/QUtil.hh> - QPDFExc::QPDFExc( qpdf_error_code_e error_code, std::string const& filename, diff --git a/libqpdf/QPDFFormFieldObjectHelper.cc b/libqpdf/QPDFFormFieldObjectHelper.cc index e76e3121..4b95c91f 100644 --- a/libqpdf/QPDFFormFieldObjectHelper.cc +++ b/libqpdf/QPDFFormFieldObjectHelper.cc @@ -6,7 +6,7 @@ #include <qpdf/QPDFAnnotationObjectHelper.hh> #include <qpdf/QTC.hh> #include <qpdf/QUtil.hh> -#include <stdlib.h> +#include <cstdlib> QPDFFormFieldObjectHelper::QPDFFormFieldObjectHelper(QPDFObjectHandle oh) : QPDFObjectHelper(oh), @@ -515,9 +515,9 @@ namespace std::vector<std::string> const& opt, double tf, QPDFObjectHandle::Rectangle const& bbox); - virtual ~ValueSetter() = default; - virtual void handleToken(QPDFTokenizer::Token const&); - virtual void handleEOF(); + ~ValueSetter() override = default; + void handleToken(QPDFTokenizer::Token const&) override; + void handleEOF() override; void writeAppearance(); private: @@ -611,7 +611,7 @@ ValueSetter::writeAppearance() // Write one or more lines, centered vertically, possibly with // one row highlighted. - size_t max_rows = static_cast<size_t>((bbox.ury - bbox.lly) / tfh); + auto max_rows = static_cast<size_t>((bbox.ury - bbox.lly) / tfh); bool highlight = false; size_t highlight_idx = 0; @@ -706,10 +706,10 @@ namespace { public: TfFinder(); - virtual ~TfFinder() + ~TfFinder() override { } - virtual void handleToken(QPDFTokenizer::Token const&); + void handleToken(QPDFTokenizer::Token const&) override; double getTf(); std::string getFontName(); std::string getDA(); diff --git a/libqpdf/QPDFJob.cc b/libqpdf/QPDFJob.cc index fbaa53e5..0e5ad3ae 100644 --- a/libqpdf/QPDFJob.cc +++ b/libqpdf/QPDFJob.cc @@ -3,7 +3,7 @@ #include <cstdio> #include <cstdlib> #include <cstring> -#include <ctype.h> +#include <cctype> #include <fcntl.h> #include <iostream> #include <memory> @@ -48,8 +48,8 @@ namespace size_t oi_min_height, size_t oi_min_area, QPDFObjectHandle& image); - virtual ~ImageOptimizer() = default; - virtual void provideStreamData(QPDFObjGen const&, Pipeline* pipeline); + ~ImageOptimizer() override = default; + void provideStreamData(QPDFObjGen const&, Pipeline* pipeline) override; std::shared_ptr<Pipeline> makePipeline(std::string const& description, Pipeline* next); bool evaluate(std::string const& description); @@ -65,13 +65,13 @@ namespace class DiscardContents: public QPDFObjectHandle::ParserCallbacks { public: - virtual ~DiscardContents() = default; - virtual void - handleObject(QPDFObjectHandle) + ~DiscardContents() override = default; + void + handleObject(QPDFObjectHandle) override { } - virtual void - handleEOF() + void + handleEOF() override { } }; @@ -98,8 +98,8 @@ namespace filename(filename) { } - virtual ~ProgressReporter() = default; - virtual void reportProgress(int); + ~ProgressReporter() override = default; + void reportProgress(int) override; private: Pipeline& p; 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 <cstdio> -#include <ctype.h> +#include <cctype> #include <iostream> #include <memory> #include <sstream> -#include <stdlib.h> -#include <string.h> +#include <cstdlib> +#include <cstring> #include <qpdf/QIntC.hh> #include <qpdf/QPDFArgParser.hh> diff --git a/libqpdf/QPDFLogger.cc b/libqpdf/QPDFLogger.cc index 7fe21c97..15d80aab 100644 --- a/libqpdf/QPDFLogger.cc +++ b/libqpdf/QPDFLogger.cc @@ -17,14 +17,14 @@ namespace { } - virtual void + void write(unsigned char const* data, size_t len) override { this->used = true; getNext()->write(data, len); } - virtual void + void finish() override { getNext()->finish(); diff --git a/libqpdf/QPDFNameTreeObjectHelper.cc b/libqpdf/QPDFNameTreeObjectHelper.cc index f388dccf..574bb097 100644 --- a/libqpdf/QPDFNameTreeObjectHelper.cc +++ b/libqpdf/QPDFNameTreeObjectHelper.cc @@ -7,18 +7,18 @@ namespace class NameTreeDetails: public NNTreeDetails { public: - virtual std::string const& + std::string const& itemsKey() const override { static std::string k("/Names"); return k; } - virtual bool + bool keyValid(QPDFObjectHandle oh) const override { return oh.isString(); } - virtual int + int compareKeys(QPDFObjectHandle a, QPDFObjectHandle b) const override { if (!(keyValid(a) && keyValid(b))) { diff --git a/libqpdf/QPDFNumberTreeObjectHelper.cc b/libqpdf/QPDFNumberTreeObjectHelper.cc index 6443416d..08f790d4 100644 --- a/libqpdf/QPDFNumberTreeObjectHelper.cc +++ b/libqpdf/QPDFNumberTreeObjectHelper.cc @@ -8,18 +8,18 @@ namespace class NumberTreeDetails: public NNTreeDetails { public: - virtual std::string const& + std::string const& itemsKey() const override { static std::string k("/Nums"); return k; } - virtual bool + bool keyValid(QPDFObjectHandle oh) const override { return oh.isInteger(); } - virtual int + int compareKeys(QPDFObjectHandle a, QPDFObjectHandle b) const override { if (!(keyValid(a) && keyValid(b))) { diff --git a/libqpdf/QPDFObjectHandle.cc b/libqpdf/QPDFObjectHandle.cc index b3f208a5..93d269d3 100644 --- a/libqpdf/QPDFObjectHandle.cc +++ b/libqpdf/QPDFObjectHandle.cc @@ -30,10 +30,10 @@ #include <algorithm> #include <cstring> -#include <ctype.h> -#include <limits.h> +#include <cctype> +#include <climits> #include <stdexcept> -#include <stdlib.h> +#include <cstdlib> using namespace std::literals; @@ -111,8 +111,8 @@ namespace old_contents(old_contents) { } - virtual ~CoalesceProvider() = default; - virtual void provideStreamData(QPDFObjGen const&, Pipeline* pipeline); + ~CoalesceProvider() override = default; + void provideStreamData(QPDFObjGen const&, Pipeline* pipeline) override; private: QPDFObjectHandle containing_page; @@ -200,9 +200,9 @@ namespace { public: LastChar(Pipeline* next); - virtual ~LastChar() = default; - virtual void write(unsigned char const* data, size_t len); - virtual void finish(); + ~LastChar() override = default; + void write(unsigned char const* data, size_t len) override; + void finish() override; unsigned char getLastChar(); private: @@ -1446,13 +1446,13 @@ namespace { } - virtual void + void provideStreamData(QPDFObjGen const&, Pipeline* pipeline) override { p1(pipeline); } - virtual bool + bool provideStreamData( QPDFObjGen const&, Pipeline* pipeline, diff --git a/libqpdf/QPDFParser.cc b/libqpdf/QPDFParser.cc index 4c43e487..e56fcce3 100644 --- a/libqpdf/QPDFParser.cc +++ b/libqpdf/QPDFParser.cc @@ -16,7 +16,6 @@ #include <qpdf/QPDF_Reserved.hh> #include <qpdf/QPDF_Stream.hh> #include <qpdf/QPDF_String.hh> -#include <qpdf/QPDF_Unresolved.hh> #include <qpdf/QTC.hh> #include <qpdf/QUtil.hh> diff --git a/libqpdf/QPDFSystemError.cc b/libqpdf/QPDFSystemError.cc index 8d129bad..ebd0d773 100644 --- a/libqpdf/QPDFSystemError.cc +++ b/libqpdf/QPDFSystemError.cc @@ -1,7 +1,6 @@ #include <qpdf/QPDFSystemError.hh> -#include <qpdf/QUtil.hh> -#include <string.h> +#include <cstring> QPDFSystemError::QPDFSystemError( std::string const& description, int system_errno) : diff --git a/libqpdf/QPDFTokenizer.cc b/libqpdf/QPDFTokenizer.cc index d8d457ab..1a14e3a9 100644 --- a/libqpdf/QPDFTokenizer.cc +++ b/libqpdf/QPDFTokenizer.cc @@ -11,8 +11,8 @@ #include <qpdf/QUtil.hh> #include <stdexcept> -#include <stdlib.h> -#include <string.h> +#include <cstdlib> +#include <cstring> static inline bool is_delimiter(char ch) @@ -35,8 +35,8 @@ namespace str(str) { } - virtual ~QPDFWordTokenFinder() = default; - virtual bool check(); + ~QPDFWordTokenFinder() override = default; + bool check() override; private: std::shared_ptr<InputSource> is; diff --git a/libqpdf/QPDFWriter.cc b/libqpdf/QPDFWriter.cc index de1aa45b..a5a54cc7 100644 --- a/libqpdf/QPDFWriter.cc +++ b/libqpdf/QPDFWriter.cc @@ -24,7 +24,7 @@ #include <algorithm> #include <stdexcept> -#include <stdlib.h> +#include <cstdlib> QPDFWriter::ProgressReporter::~ProgressReporter() { @@ -997,7 +997,7 @@ void QPDFWriter::activatePipelineStack(PipelinePopper& pp) { std::string stack_id("stack " + std::to_string(this->m->next_stack_id)); - Pl_Count* c = + 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); @@ -1030,7 +1030,7 @@ QPDFWriter::PipelinePopper::~PipelinePopper() qw->m->md5_pipeline = nullptr; } qw->m->pipeline_stack.pop_back(); - Pl_Buffer* buf = dynamic_cast<Pl_Buffer*>(p); + auto* buf = dynamic_cast<Pl_Buffer*>(p); if (bp && buf) { *bp = buf->getBufferSharedPointer(); } diff --git a/libqpdf/QPDFXRefEntry.cc b/libqpdf/QPDFXRefEntry.cc index 77f641b0..0d66028c 100644 --- a/libqpdf/QPDFXRefEntry.cc +++ b/libqpdf/QPDFXRefEntry.cc @@ -2,7 +2,6 @@ #include <qpdf/QIntC.hh> #include <qpdf/QPDFExc.hh> -#include <qpdf/QUtil.hh> QPDFXRefEntry::QPDFXRefEntry() { diff --git a/libqpdf/QPDF_Array.cc b/libqpdf/QPDF_Array.cc index 3bd139b1..d0228361 100644 --- a/libqpdf/QPDF_Array.cc +++ b/libqpdf/QPDF_Array.cc @@ -83,7 +83,7 @@ QPDF_Array::copy(bool shallow) return do_create(new QPDF_Array(*this)); } else { if (sparse) { - QPDF_Array* result = new QPDF_Array(); + auto* result = new QPDF_Array(); result->sp_size = sp_size; for (auto const& element: sp_elements) { auto const& obj = element.second; diff --git a/libqpdf/QPDF_Name.cc b/libqpdf/QPDF_Name.cc index 2fa697cf..11b30086 100644 --- a/libqpdf/QPDF_Name.cc +++ b/libqpdf/QPDF_Name.cc @@ -1,8 +1,6 @@ #include <qpdf/QPDF_Name.hh> #include <qpdf/QUtil.hh> -#include <stdio.h> -#include <string.h> QPDF_Name::QPDF_Name(std::string const& name) : QPDFValue(::ot_name, "name"), diff --git a/libqpdf/QPDF_Stream.cc b/libqpdf/QPDF_Stream.cc index 8e2e16c5..9cfb3ac4 100644 --- a/libqpdf/QPDF_Stream.cc +++ b/libqpdf/QPDF_Stream.cc @@ -27,10 +27,10 @@ namespace { public: SF_Crypt() = default; - virtual ~SF_Crypt() = default; + ~SF_Crypt() override = default; - virtual bool - setDecodeParms(QPDFObjectHandle decode_parms) + bool + setDecodeParms(QPDFObjectHandle decode_parms) override { if (decode_parms.isNull()) { return true; @@ -49,8 +49,8 @@ namespace return filterable; } - virtual Pipeline* - getDecodePipeline(Pipeline*) + Pipeline* + getDecodePipeline(Pipeline*) override { // Not used -- handled by pipeStreamData return nullptr; @@ -557,7 +557,7 @@ QPDF_Stream::pipeStreamData( if (decode_pipeline) { pipeline = decode_pipeline; } - Pl_Flate* flate = dynamic_cast<Pl_Flate*>(pipeline); + auto* flate = dynamic_cast<Pl_Flate*>(pipeline); if (flate != nullptr) { flate->setWarnCallback( [this](char const* msg, int code) { warn(msg); }); diff --git a/libqpdf/QPDF_String.cc b/libqpdf/QPDF_String.cc index c3148fa0..51742bdd 100644 --- a/libqpdf/QPDF_String.cc +++ b/libqpdf/QPDF_String.cc @@ -5,7 +5,6 @@ // DO NOT USE ctype -- it is locale dependent for some things, and // it's not worth the risk of including it in case it may accidentally // be used. -#include <string.h> static bool is_iso_latin1_printable(char ch) 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 <qpdf/RC4.hh> #include <algorithm> -#include <string.h> +#include <cstring> static unsigned char const padding_string[] = { 0x28, 0xbf, 0x4e, 0x5e, 0x4e, 0x75, 0x8a, 0x41, 0x64, 0x00, 0x4e, diff --git a/libqpdf/QPDF_json.cc b/libqpdf/QPDF_json.cc index 563e8e29..9e3cb3bb 100644 --- a/libqpdf/QPDF_json.cc +++ b/libqpdf/QPDF_json.cc @@ -242,13 +242,13 @@ class QPDF::JSONReactor: public JSON::Reactor } } virtual ~JSONReactor() = default; - virtual void dictionaryStart() override; - virtual void arrayStart() override; - virtual void containerEnd(JSON const& value) override; - virtual void topLevelScalar() override; - virtual bool + void dictionaryStart() override; + void arrayStart() override; + void containerEnd(JSON const& value) override; + void topLevelScalar() override; + bool dictionaryItem(std::string const& key, JSON const& value) override; - virtual bool arrayItem(JSON const& value) override; + bool arrayItem(JSON const& value) override; bool anyErrors() const; diff --git a/libqpdf/QPDF_linearization.cc b/libqpdf/QPDF_linearization.cc index 926353fa..eade317e 100644 --- a/libqpdf/QPDF_linearization.cc +++ b/libqpdf/QPDF_linearization.cc @@ -13,9 +13,8 @@ #include <qpdf/QUtil.hh> #include <algorithm> -#include <iostream> -#include <math.h> -#include <string.h> +#include <cmath> +#include <cstring> template <class T, class int_type> static void 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/libqpdf/QTC.cc b/libqpdf/QTC.cc index 8188846c..e537a0e1 100644 --- a/libqpdf/QTC.cc +++ b/libqpdf/QTC.cc @@ -3,7 +3,7 @@ #include <qpdf/QUtil.hh> #include <map> #include <set> -#include <stdio.h> +#include <cstdio> static bool tc_active(char const* const scope) diff --git a/libqpdf/QUtil.cc b/libqpdf/QUtil.cc index 03301d9d..a542736d 100644 --- a/libqpdf/QUtil.cc +++ b/libqpdf/QUtil.cc @@ -9,9 +9,8 @@ #include <qpdf/QPDFSystemError.hh> #include <qpdf/QTC.hh> -#include <cmath> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <fcntl.h> #include <fstream> #include <iomanip> @@ -22,9 +21,9 @@ #include <set> #include <sstream> #include <stdexcept> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> +#include <cstdio> +#include <cstdlib> +#include <cstring> #ifndef QPDF_NO_WCHAR_T # include <cwchar> #endif @@ -837,8 +836,8 @@ char* QUtil::getWhoami(char* argv0) { char* whoami = nullptr; - if (((whoami = strrchr(argv0, '/')) == NULL) && - ((whoami = strrchr(argv0, '\\')) == NULL)) { + if (((whoami = strrchr(argv0, '/')) == nullptr) && + ((whoami = strrchr(argv0, '\\')) == nullptr)) { whoami = argv0; } else { ++whoami; diff --git a/libqpdf/RC4.cc b/libqpdf/RC4.cc index 6fc25a86..2d1b783d 100644 --- a/libqpdf/RC4.cc +++ b/libqpdf/RC4.cc @@ -2,7 +2,6 @@ #include <qpdf/QPDFCryptoProvider.hh> -#include <string.h> RC4::RC4(unsigned char const* key_data, int key_len) : crypto(QPDFCryptoProvider::getImpl()) diff --git a/libqpdf/qpdf-c.cc b/libqpdf/qpdf-c.cc index 01987365..8f36195a 100644 --- a/libqpdf/qpdf-c.cc +++ b/libqpdf/qpdf-c.cc @@ -15,7 +15,6 @@ #include <qpdf/qpdf-c_impl.hh> #include <qpdf/qpdflogger-c_impl.hh> -#include <cstring> #include <functional> #include <list> #include <stdexcept> @@ -107,7 +106,7 @@ qpdf_data qpdf_init() { QTC::TC("qpdf", "qpdf-c called qpdf_init"); - qpdf_data qpdf = new _qpdf_data(); + auto qpdf = new _qpdf_data(); qpdf->qpdf = QPDF::create(); return qpdf; } 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 <stddef.h> +#include <cstddef> 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 <stddef.h> +#include <cstddef> class Pipeline; diff --git a/libqpdf/qpdf/ContentNormalizer.hh b/libqpdf/qpdf/ContentNormalizer.hh index ba1063e0..d423aa4c 100644 --- a/libqpdf/qpdf/ContentNormalizer.hh +++ b/libqpdf/qpdf/ContentNormalizer.hh @@ -7,8 +7,8 @@ class ContentNormalizer: public QPDFObjectHandle::TokenFilter { public: ContentNormalizer(); - virtual ~ContentNormalizer() = default; - virtual void handleToken(QPDFTokenizer::Token const&); + ~ContentNormalizer() override = default; + void handleToken(QPDFTokenizer::Token const&) override; bool anyBadTokens() const; bool lastTokenWasBad() const; diff --git a/libqpdf/qpdf/CryptoRandomDataProvider.hh b/libqpdf/qpdf/CryptoRandomDataProvider.hh index 89859e65..e402d944 100644 --- a/libqpdf/qpdf/CryptoRandomDataProvider.hh +++ b/libqpdf/qpdf/CryptoRandomDataProvider.hh @@ -7,8 +7,8 @@ class CryptoRandomDataProvider: public RandomDataProvider { public: CryptoRandomDataProvider() = default; - virtual ~CryptoRandomDataProvider() = default; - virtual void provideRandomData(unsigned char* data, size_t len); + ~CryptoRandomDataProvider() override = default; + void provideRandomData(unsigned char* data, size_t len) override; static RandomDataProvider* getInstance(); }; diff --git a/libqpdf/qpdf/InsecureRandomDataProvider.hh b/libqpdf/qpdf/InsecureRandomDataProvider.hh index 47a81afe..bab4e002 100644 --- a/libqpdf/qpdf/InsecureRandomDataProvider.hh +++ b/libqpdf/qpdf/InsecureRandomDataProvider.hh @@ -7,8 +7,8 @@ class InsecureRandomDataProvider: public RandomDataProvider { public: InsecureRandomDataProvider(); - virtual ~InsecureRandomDataProvider() = default; - virtual void provideRandomData(unsigned char* data, size_t len); + ~InsecureRandomDataProvider() override = default; + void provideRandomData(unsigned char* data, size_t len) override; static RandomDataProvider* getInstance(); private: diff --git a/libqpdf/qpdf/OffsetInputSource.hh b/libqpdf/qpdf/OffsetInputSource.hh index d8b08145..fdc1a404 100644 --- a/libqpdf/qpdf/OffsetInputSource.hh +++ b/libqpdf/qpdf/OffsetInputSource.hh @@ -11,15 +11,15 @@ class OffsetInputSource: public InputSource public: OffsetInputSource( std::shared_ptr<InputSource>, qpdf_offset_t global_offset); - virtual ~OffsetInputSource() = default; + ~OffsetInputSource() override = default; - virtual qpdf_offset_t findAndSkipNextEOL(); - virtual std::string const& getName() const; - virtual qpdf_offset_t tell(); - virtual void seek(qpdf_offset_t offset, int whence); - virtual void rewind(); - virtual size_t read(char* buffer, size_t length); - virtual void unreadCh(char ch); + qpdf_offset_t findAndSkipNextEOL() override; + std::string const& getName() const override; + qpdf_offset_t tell() override; + void seek(qpdf_offset_t offset, int whence) override; + void rewind() override; + size_t read(char* buffer, size_t length) override; + void unreadCh(char ch) override; private: std::shared_ptr<InputSource> proxied; diff --git a/libqpdf/qpdf/Pl_AES_PDF.hh b/libqpdf/qpdf/Pl_AES_PDF.hh index 18091583..b3fde312 100644 --- a/libqpdf/qpdf/Pl_AES_PDF.hh +++ b/libqpdf/qpdf/Pl_AES_PDF.hh @@ -18,10 +18,10 @@ class Pl_AES_PDF: public Pipeline bool encrypt, unsigned char const* key, size_t key_bytes); - virtual ~Pl_AES_PDF() = default; + ~Pl_AES_PDF() override = default; - virtual void write(unsigned char const* data, size_t len); - virtual void finish(); + void write(unsigned char const* data, size_t len) override; + void finish() override; // Use zero initialization vector; needed for AESV3 void useZeroIV(); diff --git a/libqpdf/qpdf/Pl_ASCII85Decoder.hh b/libqpdf/qpdf/Pl_ASCII85Decoder.hh index 667b56e9..dd5efd06 100644 --- a/libqpdf/qpdf/Pl_ASCII85Decoder.hh +++ b/libqpdf/qpdf/Pl_ASCII85Decoder.hh @@ -7,9 +7,9 @@ class Pl_ASCII85Decoder: public Pipeline { public: Pl_ASCII85Decoder(char const* identifier, Pipeline* next); - virtual ~Pl_ASCII85Decoder() = default; - virtual void write(unsigned char const* buf, size_t len); - virtual void finish(); + ~Pl_ASCII85Decoder() override = default; + void write(unsigned char const* buf, size_t len) override; + void finish() override; private: void flush(); diff --git a/libqpdf/qpdf/Pl_ASCIIHexDecoder.hh b/libqpdf/qpdf/Pl_ASCIIHexDecoder.hh index c71dcf00..5edf74f0 100644 --- a/libqpdf/qpdf/Pl_ASCIIHexDecoder.hh +++ b/libqpdf/qpdf/Pl_ASCIIHexDecoder.hh @@ -7,9 +7,9 @@ class Pl_ASCIIHexDecoder: public Pipeline { public: Pl_ASCIIHexDecoder(char const* identifier, Pipeline* next); - virtual ~Pl_ASCIIHexDecoder() = default; - virtual void write(unsigned char const* buf, size_t len); - virtual void finish(); + ~Pl_ASCIIHexDecoder() override = default; + void write(unsigned char const* buf, size_t len) override; + void finish() override; private: void flush(); diff --git a/libqpdf/qpdf/Pl_Base64.hh b/libqpdf/qpdf/Pl_Base64.hh index 788bfd6d..a084a17f 100644 --- a/libqpdf/qpdf/Pl_Base64.hh +++ b/libqpdf/qpdf/Pl_Base64.hh @@ -8,9 +8,9 @@ class Pl_Base64: public Pipeline public: enum action_e { a_encode, a_decode }; Pl_Base64(char const* identifier, Pipeline* next, action_e); - virtual ~Pl_Base64() = default; - virtual void write(unsigned char const* buf, size_t len) override; - virtual void finish() override; + ~Pl_Base64() override = default; + void write(unsigned char const* buf, size_t len) override; + void finish() override; private: void decode(unsigned char const* buf, size_t len); diff --git a/libqpdf/qpdf/Pl_PNGFilter.hh b/libqpdf/qpdf/Pl_PNGFilter.hh index 6cc34a9c..7ab7bf0d 100644 --- a/libqpdf/qpdf/Pl_PNGFilter.hh +++ b/libqpdf/qpdf/Pl_PNGFilter.hh @@ -22,10 +22,10 @@ class Pl_PNGFilter: public Pipeline unsigned int columns, unsigned int samples_per_pixel = 1, unsigned int bits_per_sample = 8); - virtual ~Pl_PNGFilter() = default; + ~Pl_PNGFilter() override = default; - virtual void write(unsigned char const* data, size_t len); - virtual void finish(); + void write(unsigned char const* data, size_t len) override; + void finish() override; private: void decodeSub(); diff --git a/libqpdf/qpdf/Pl_RC4.hh b/libqpdf/qpdf/Pl_RC4.hh index 07b8a1c4..49c943b9 100644 --- a/libqpdf/qpdf/Pl_RC4.hh +++ b/libqpdf/qpdf/Pl_RC4.hh @@ -17,10 +17,10 @@ class Pl_RC4: public Pipeline unsigned char const* key_data, int key_len = -1, size_t out_bufsize = def_bufsize); - virtual ~Pl_RC4() = default; + ~Pl_RC4() override = default; - virtual void write(unsigned char const* data, size_t len); - virtual void finish(); + void write(unsigned char const* data, size_t len) override; + void finish() override; private: std::shared_ptr<unsigned char> outbuf; diff --git a/libqpdf/qpdf/Pl_SHA2.hh b/libqpdf/qpdf/Pl_SHA2.hh index d5b2e547..571271eb 100644 --- a/libqpdf/qpdf/Pl_SHA2.hh +++ b/libqpdf/qpdf/Pl_SHA2.hh @@ -20,10 +20,10 @@ class Pl_SHA2: public Pipeline { public: - Pl_SHA2(int bits = 0, Pipeline* next = 0); - virtual ~Pl_SHA2() = default; - virtual void write(unsigned char const*, size_t); - virtual void finish(); + Pl_SHA2(int bits = 0, Pipeline* next = nullptr); + ~Pl_SHA2() override = default; + void write(unsigned char const*, size_t) override; + void finish() override; void resetBits(int bits); std::string getHexDigest(); std::string getRawDigest(); diff --git a/libqpdf/qpdf/Pl_TIFFPredictor.hh b/libqpdf/qpdf/Pl_TIFFPredictor.hh index 2b3bdb10..6bc48e72 100644 --- a/libqpdf/qpdf/Pl_TIFFPredictor.hh +++ b/libqpdf/qpdf/Pl_TIFFPredictor.hh @@ -18,10 +18,10 @@ class Pl_TIFFPredictor: public Pipeline unsigned int columns, unsigned int samples_per_pixel = 1, unsigned int bits_per_sample = 8); - virtual ~Pl_TIFFPredictor() = default; + ~Pl_TIFFPredictor() override = default; - virtual void write(unsigned char const* data, size_t len); - virtual void finish(); + void write(unsigned char const* data, size_t len) override; + void finish() override; private: void processRow(); diff --git a/libqpdf/qpdf/QPDFArgParser.hh b/libqpdf/qpdf/QPDFArgParser.hh index 89c7acc0..759ad148 100644 --- a/libqpdf/qpdf/QPDFArgParser.hh +++ b/libqpdf/qpdf/QPDFArgParser.hh @@ -177,9 +177,9 @@ class QPDFArgParser { OptionEntry() : parameter_needed(false), - bare_arg_handler(0), - param_arg_handler(0), - invalid_choice_handler(0) + bare_arg_handler(nullptr), + param_arg_handler(nullptr), + invalid_choice_handler(nullptr) { } bool parameter_needed; diff --git a/libqpdf/qpdf/QPDFCrypto_openssl.hh b/libqpdf/qpdf/QPDFCrypto_openssl.hh index eae69ab1..0d07b99b 100644 --- a/libqpdf/qpdf/QPDFCrypto_openssl.hh +++ b/libqpdf/qpdf/QPDFCrypto_openssl.hh @@ -39,7 +39,7 @@ class QPDFCrypto_openssl: public QPDFCryptoImpl void RC4_process( unsigned char const* in_data, size_t len, - unsigned char* out_data = 0) override; + unsigned char* out_data = nullptr) override; void RC4_finalize() override; void SHA2_init(int bits) override; diff --git a/libqpdf/qpdf/ResourceFinder.hh b/libqpdf/qpdf/ResourceFinder.hh index d037e600..c4f5673b 100644 --- a/libqpdf/qpdf/ResourceFinder.hh +++ b/libqpdf/qpdf/ResourceFinder.hh @@ -8,8 +8,8 @@ class ResourceFinder: public QPDFObjectHandle::ParserCallbacks public: ResourceFinder(); virtual ~ResourceFinder() = default; - virtual void handleObject(QPDFObjectHandle, size_t, size_t) override; - virtual void handleEOF() override; + void handleObject(QPDFObjectHandle, size_t, size_t) override; + void handleEOF() override; std::set<std::string> const& getNames() const; std::map<std::string, std::map<std::string, std::set<size_t>>> const& getNamesByResourceType() const; diff --git a/libqpdf/qpdf/SF_ASCII85Decode.hh b/libqpdf/qpdf/SF_ASCII85Decode.hh index 0b77d2e4..f383364a 100644 --- a/libqpdf/qpdf/SF_ASCII85Decode.hh +++ b/libqpdf/qpdf/SF_ASCII85Decode.hh @@ -11,7 +11,7 @@ class SF_ASCII85Decode: public QPDFStreamFilter SF_ASCII85Decode() = default; virtual ~SF_ASCII85Decode() = default; - virtual Pipeline* + Pipeline* getDecodePipeline(Pipeline* next) override { this->pipeline = diff --git a/libqpdf/qpdf/SF_ASCIIHexDecode.hh b/libqpdf/qpdf/SF_ASCIIHexDecode.hh index 6454ce44..911f7370 100644 --- a/libqpdf/qpdf/SF_ASCIIHexDecode.hh +++ b/libqpdf/qpdf/SF_ASCIIHexDecode.hh @@ -11,7 +11,7 @@ class SF_ASCIIHexDecode: public QPDFStreamFilter SF_ASCIIHexDecode() = default; virtual ~SF_ASCIIHexDecode() = default; - virtual Pipeline* + Pipeline* getDecodePipeline(Pipeline* next) override { this->pipeline = diff --git a/libqpdf/qpdf/SF_DCTDecode.hh b/libqpdf/qpdf/SF_DCTDecode.hh index f9b1af3a..997ba89a 100644 --- a/libqpdf/qpdf/SF_DCTDecode.hh +++ b/libqpdf/qpdf/SF_DCTDecode.hh @@ -11,7 +11,7 @@ class SF_DCTDecode: public QPDFStreamFilter SF_DCTDecode() = default; virtual ~SF_DCTDecode() = default; - virtual Pipeline* + Pipeline* getDecodePipeline(Pipeline* next) override { this->pipeline = std::make_shared<Pl_DCT>("DCT decode", next); @@ -24,13 +24,13 @@ class SF_DCTDecode: public QPDFStreamFilter return std::make_shared<SF_DCTDecode>(); } - virtual bool + bool isSpecializedCompression() override { return true; } - virtual bool + bool isLossyCompression() override { return true; diff --git a/libqpdf/qpdf/SF_RunLengthDecode.hh b/libqpdf/qpdf/SF_RunLengthDecode.hh index a1c8c80a..9dec379d 100644 --- a/libqpdf/qpdf/SF_RunLengthDecode.hh +++ b/libqpdf/qpdf/SF_RunLengthDecode.hh @@ -11,7 +11,7 @@ class SF_RunLengthDecode: public QPDFStreamFilter SF_RunLengthDecode() = default; virtual ~SF_RunLengthDecode() = default; - virtual Pipeline* + Pipeline* getDecodePipeline(Pipeline* next) override { this->pipeline = std::make_shared<Pl_RunLength>( @@ -25,7 +25,7 @@ class SF_RunLengthDecode: public QPDFStreamFilter return std::make_shared<SF_RunLengthDecode>(); } - virtual bool + bool isSpecializedCompression() override { return true; diff --git a/libqpdf/qpdfjob-c.cc b/libqpdf/qpdfjob-c.cc index ddb33349..2e78672f 100644 --- a/libqpdf/qpdfjob-c.cc +++ b/libqpdf/qpdfjob-c.cc @@ -1,14 +1,12 @@ #include <qpdf/qpdfjob-c.h> #include <qpdf/QPDFJob.hh> -#include <qpdf/QPDFLogger.hh> #include <qpdf/QPDFUsage.hh> #include <qpdf/QUtil.hh> #include <qpdf/qpdf-c_impl.hh> #include <qpdf/qpdflogger-c_impl.hh> #include <cstdio> -#include <cstring> struct _qpdfjob_handle { diff --git a/libqpdf/qpdflogger-c.cc b/libqpdf/qpdflogger-c.cc index 2a6d1052..c713dfb4 100644 --- a/libqpdf/qpdflogger-c.cc +++ b/libqpdf/qpdflogger-c.cc @@ -4,7 +4,6 @@ #include <qpdf/Pipeline.hh> #include <qpdf/Pl_Function.hh> -#include <qpdf/QIntC.hh> #include <qpdf/QPDFLogger.hh> #include <functional> #include <memory> |