diff options
Diffstat (limited to 'Build/source/libs/poppler/poppler-src/poppler/TextOutputDev.h')
-rw-r--r-- | Build/source/libs/poppler/poppler-src/poppler/TextOutputDev.h | 62 |
1 files changed, 31 insertions, 31 deletions
diff --git a/Build/source/libs/poppler/poppler-src/poppler/TextOutputDev.h b/Build/source/libs/poppler/poppler-src/poppler/TextOutputDev.h index 005be45f9ec..380301fdeeb 100644 --- a/Build/source/libs/poppler/poppler-src/poppler/TextOutputDev.h +++ b/Build/source/libs/poppler/poppler-src/poppler/TextOutputDev.h @@ -16,7 +16,7 @@ // Copyright (C) 2005-2007 Kristian Høgsberg <krh@redhat.com> // Copyright (C) 2006 Ed Catmur <ed@catmur.co.uk> // Copyright (C) 2007, 2008, 2011, 2013 Carlos Garcia Campos <carlosgc@gnome.org> -// Copyright (C) 2007 Adrian Johnson <ajohnson@redneon.com> +// Copyright (C) 2007, 2017 Adrian Johnson <ajohnson@redneon.com> // Copyright (C) 2008, 2010, 2015, 2016 Albert Astals Cid <aacid@kde.org> // Copyright (C) 2010 Brian Ewins <brian.ewins@gmail.com> // Copyright (C) 2012, 2013, 2015, 2016 Jason Crain <jason@aquaticape.us> @@ -91,7 +91,7 @@ public: // Get the writing mode (0 or 1), or 0 if the font is not set int getWMode(); -#if TEXTOUT_WORD_LIST +#ifdef TEXTOUT_WORD_LIST // Get the font name (which may be NULL). GooString *getFontName() { return fontName; } @@ -106,7 +106,7 @@ public: private: GfxFont *gfxFont; -#if TEXTOUT_WORD_LIST +#ifdef TEXTOUT_WORD_LIST GooString *fontName; int flags; #endif @@ -165,7 +165,7 @@ public: // Get the next TextWord on the linked list. TextWord *getNext() { return next; } -#if TEXTOUT_WORD_LIST +#ifdef TEXTOUT_WORD_LIST int getLength() { return len; } const Unicode *getChar(int idx) { return &text[idx]; } GooString *getText(); @@ -215,7 +215,7 @@ private: GBool underlined; TextWord *next; // next word in line -#if TEXTOUT_WORD_LIST +#ifdef TEXTOUT_WORD_LIST double colorR, // word color colorG, colorB; @@ -471,7 +471,7 @@ private: friend class TextPage; }; -#if TEXTOUT_WORD_LIST +#ifdef TEXTOUT_WORD_LIST //------------------------------------------------------------------------ // TextWordList @@ -628,7 +628,7 @@ public: // character are drawn on eachother. void setMergeCombining(GBool merge); -#if TEXTOUT_WORD_LIST +#ifdef TEXTOUT_WORD_LIST // Build a flat word list, in content stream order (if // this->rawOrder is true), physical layout order (if <physLayout> // is true and this->rawOrder is false), or reading order (if both @@ -745,7 +745,7 @@ public: GBool rawOrderA); // Destructor. - virtual ~TextOutputDev(); + ~TextOutputDev(); // Check if file was successfully created. virtual GBool isOk() { return ok; } @@ -754,54 +754,54 @@ public: // Does this device use upside-down coordinates? // (Upside-down means (0,0) is the top left corner of the page.) - virtual GBool upsideDown() { return gTrue; } + GBool upsideDown() override { return gTrue; } // Does this device use drawChar() or drawString()? - virtual GBool useDrawChar() { return gTrue; } + GBool useDrawChar() override { return gTrue; } // Does this device use beginType3Char/endType3Char? Otherwise, // text in Type 3 fonts will be drawn with drawChar/drawString. - virtual GBool interpretType3Chars() { return gFalse; } + GBool interpretType3Chars() override { return gFalse; } // Does this device need non-text content? - virtual GBool needNonText() { return gFalse; } + GBool needNonText() override { return gFalse; } // Does this device require incCharCount to be called for text on // non-shown layers? - virtual GBool needCharCount() { return gTrue; } + GBool needCharCount() override { return gTrue; } //----- initialization and control // Start a page. - virtual void startPage(int pageNum, GfxState *state, XRef *xref); + void startPage(int pageNum, GfxState *state, XRef *xref) override; // End a page. - virtual void endPage(); + void endPage() override; //----- save/restore graphics state - virtual void restoreState(GfxState *state); + void restoreState(GfxState *state) override; //----- update text state - virtual void updateFont(GfxState *state); + void updateFont(GfxState *state) override; //----- text drawing - virtual void beginString(GfxState *state, GooString *s); - virtual void endString(GfxState *state); - virtual void drawChar(GfxState *state, double x, double y, - double dx, double dy, - double originX, double originY, - CharCode c, int nBytes, Unicode *u, int uLen); - virtual void incCharCount(int nChars); - virtual void beginActualText(GfxState *state, GooString *text); - virtual void endActualText(GfxState *state); + void beginString(GfxState *state, GooString *s) override; + void endString(GfxState *state) override; + void drawChar(GfxState *state, double x, double y, + double dx, double dy, + double originX, double originY, + CharCode c, int nBytes, Unicode *u, int uLen) override; + void incCharCount(int nChars) override; + void beginActualText(GfxState *state, GooString *text) override; + void endActualText(GfxState *state) override; //----- path painting - virtual void stroke(GfxState *state); - virtual void fill(GfxState *state); - virtual void eoFill(GfxState *state); + void stroke(GfxState *state) override; + void fill(GfxState *state) override; + void eoFill(GfxState *state) override; //----- link borders - virtual void processLink(AnnotLink *link); + void processLink(AnnotLink *link) override; //----- special access @@ -847,7 +847,7 @@ public: // character are drawn on eachother. void setMergeCombining(GBool merge); -#if TEXTOUT_WORD_LIST +#ifdef TEXTOUT_WORD_LIST // Build a flat word list, in content stream order (if // this->rawOrder is true), physical layout order (if // this->physLayout is true and this->rawOrder is false), or reading |