From 9f9d519a1e2063d24f4d93eef2b8afafb1241ed9 Mon Sep 17 00:00:00 2001 From: Jannick Date: Sun, 16 Jul 2017 19:51:49 +0200 Subject: [PATCH 1/6] added override tag to function declarations --- poppler/FlateStream.h | 16 ++++++++-------- poppler/JPXStream.h | 16 ++++++++-------- poppler/Stream.h | 16 ++++++++-------- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/poppler/FlateStream.h b/poppler/FlateStream.h index 9e3835f..6a88a23 100644 --- a/poppler/FlateStream.h +++ b/poppler/FlateStream.h @@ -46,14 +46,14 @@ public: FlateStream(Stream *strA, int predictor, int columns, int colors, int bits); virtual ~FlateStream(); - virtual StreamKind getKind() { return strFlate; } - virtual void reset(); - virtual int getChar(); - virtual int lookChar(); - virtual int getRawChar(); - virtual void getRawChars(int nChars, int *buffer); - virtual GooString *getPSFilter(int psLevel, const char *indent); - virtual GBool isBinary(GBool last = gTrue); + virtual StreamKind getKind() override { return strFlate; } + virtual void reset() override; + virtual int getChar() override; + virtual int lookChar() override; + virtual int getRawChar() override; + virtual void getRawChars(int nChars, int *buffer) override; + virtual GooString *getPSFilter(int psLevel, const char *indent) override; + virtual GBool isBinary(GBool last = gTrue) override; private: inline int doGetRawChar() { diff --git a/poppler/JPXStream.h b/poppler/JPXStream.h index 3085543..8926ffe 100644 --- a/poppler/JPXStream.h +++ b/poppler/JPXStream.h @@ -262,15 +262,15 @@ public: JPXStream(Stream *strA); virtual ~JPXStream(); - virtual StreamKind getKind() { return strJPX; } - virtual void reset(); - virtual void close(); - virtual int getChar(); - virtual int lookChar(); - virtual GooString *getPSFilter(int psLevel, const char *indent); - virtual GBool isBinary(GBool last = gTrue); + virtual StreamKind getKind() override { return strJPX; } + virtual void reset() override; + virtual void close() override; + virtual int getChar() override; + virtual int lookChar() override; + virtual GooString *getPSFilter(int psLevel, const char *indent) override; + virtual GBool isBinary(GBool last = gTrue) override; virtual void getImageParams(int *bitsPerComponent, - StreamColorSpaceMode *csMode); + StreamColorSpaceMode *csMode) override; private: diff --git a/poppler/Stream.h b/poppler/Stream.h index 91b524f..f3cf38b 100644 --- a/poppler/Stream.h +++ b/poppler/Stream.h @@ -870,15 +870,15 @@ public: DCTStream(Stream *strA, int colorXformA, Object *dict, int recursion); virtual ~DCTStream(); - virtual StreamKind getKind() { return strDCT; } - virtual void reset(); - virtual void close(); - virtual int getChar(); - virtual int lookChar(); - virtual GooString *getPSFilter(int psLevel, const char *indent); - virtual GBool isBinary(GBool last = gTrue); + StreamKind getKind() override { return strDCT; } + void reset() override; + void close() override; + int getChar() override; + int lookChar() override; + GooString *getPSFilter(int psLevel, const char *indent) override; + GBool isBinary(GBool last = gTrue) override; - virtual void unfilteredReset(); + void unfilteredReset() override; private: -- 2.7.1.windows.2