summaryrefslogtreecommitdiffstats
path: root/libqpdf
diff options
context:
space:
mode:
Diffstat (limited to 'libqpdf')
-rw-r--r--libqpdf/QPDF.cc2
-rw-r--r--libqpdf/QPDFFormFieldObjectHelper.cc10
-rw-r--r--libqpdf/QPDFJob.cc18
-rw-r--r--libqpdf/QPDFObjectHandle.cc10
-rw-r--r--libqpdf/QPDFTokenizer.cc4
-rw-r--r--libqpdf/QPDF_Stream.cc10
-rw-r--r--libqpdf/qpdf/ContentNormalizer.hh4
-rw-r--r--libqpdf/qpdf/CryptoRandomDataProvider.hh4
-rw-r--r--libqpdf/qpdf/InsecureRandomDataProvider.hh4
-rw-r--r--libqpdf/qpdf/OffsetInputSource.hh16
-rw-r--r--libqpdf/qpdf/Pl_AES_PDF.hh6
-rw-r--r--libqpdf/qpdf/Pl_ASCII85Decoder.hh6
-rw-r--r--libqpdf/qpdf/Pl_ASCIIHexDecoder.hh6
-rw-r--r--libqpdf/qpdf/Pl_Base64.hh2
-rw-r--r--libqpdf/qpdf/Pl_PNGFilter.hh6
-rw-r--r--libqpdf/qpdf/Pl_RC4.hh6
-rw-r--r--libqpdf/qpdf/Pl_SHA2.hh6
-rw-r--r--libqpdf/qpdf/Pl_TIFFPredictor.hh6
18 files changed, 63 insertions, 63 deletions
diff --git a/libqpdf/QPDF.cc b/libqpdf/QPDF.cc
index dcfd5f46..09221394 100644
--- a/libqpdf/QPDF.cc
+++ b/libqpdf/QPDF.cc
@@ -60,7 +60,7 @@ namespace
class InvalidInputSource: public InputSource
{
public:
- virtual ~InvalidInputSource() = default;
+ ~InvalidInputSource() override = default;
qpdf_offset_t
findAndSkipNextEOL() override
{
diff --git a/libqpdf/QPDFFormFieldObjectHelper.cc b/libqpdf/QPDFFormFieldObjectHelper.cc
index 7712cab2..4b95c91f 100644
--- a/libqpdf/QPDFFormFieldObjectHelper.cc
+++ b/libqpdf/QPDFFormFieldObjectHelper.cc
@@ -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:
@@ -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 14583104..0e5ad3ae 100644
--- a/libqpdf/QPDFJob.cc
+++ b/libqpdf/QPDFJob.cc
@@ -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/QPDFObjectHandle.cc b/libqpdf/QPDFObjectHandle.cc
index 8b30f95b..93d269d3 100644
--- a/libqpdf/QPDFObjectHandle.cc
+++ b/libqpdf/QPDFObjectHandle.cc
@@ -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:
diff --git a/libqpdf/QPDFTokenizer.cc b/libqpdf/QPDFTokenizer.cc
index d83080b2..1a14e3a9 100644
--- a/libqpdf/QPDFTokenizer.cc
+++ b/libqpdf/QPDFTokenizer.cc
@@ -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/QPDF_Stream.cc b/libqpdf/QPDF_Stream.cc
index 4ceeab48..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;
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 0e490cfe..a084a17f 100644
--- a/libqpdf/qpdf/Pl_Base64.hh
+++ b/libqpdf/qpdf/Pl_Base64.hh
@@ -8,7 +8,7 @@ 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;
+ ~Pl_Base64() override = default;
void write(unsigned char const* buf, size_t len) override;
void finish() override;
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 99a19a37..571271eb 100644
--- a/libqpdf/qpdf/Pl_SHA2.hh
+++ b/libqpdf/qpdf/Pl_SHA2.hh
@@ -21,9 +21,9 @@ class Pl_SHA2: public Pipeline
{
public:
Pl_SHA2(int bits = 0, Pipeline* next = nullptr);
- virtual ~Pl_SHA2() = default;
- virtual void write(unsigned char const*, size_t);
- virtual void finish();
+ ~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();