summaryrefslogtreecommitdiff
path: root/poppler/TextOutputDev.h
diff options
context:
space:
mode:
authorAdrian Johnson <ajohnson@redneon.com>2017-10-01 18:48:07 +1030
committerAdrian Johnson <ajohnson@redneon.com>2017-10-21 21:02:25 +1030
commit465edbbffcc94f9af9fac7606086a28362f92d09 (patch)
treee8cc9de37aae1dac18fda6530114efe490a8b32f /poppler/TextOutputDev.h
parentb424862bf5df75db651076c780c7242eaf887479 (diff)
Fix remaining -Wundef warnings
and make -Wundef a default warning
Diffstat (limited to 'poppler/TextOutputDev.h')
-rw-r--r--poppler/TextOutputDev.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/poppler/TextOutputDev.h b/poppler/TextOutputDev.h
index 707d8ca9..675ed600 100644
--- a/poppler/TextOutputDev.h
+++ b/poppler/TextOutputDev.h
@@ -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
@@ -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