More const

Marked some caches as mutable

Fixed an actual bug in page::text that was swapping the page cropbox in
each call

1 files changed, 12 insertions, 12 deletions

diff --git a/poppler/TextOutputDev.h b/poppler/TextOutputDev.h
index e793401f..1af11909 100644
--- a/poppler/TextOutputDev.h
+++ b/poppler/TextOutputDev.h
@@ -84,28 +84,28 @@ public:
   TextFontInfo(const TextFontInfo &) = delete;
   TextFontInfo& operator=(const TextFontInfo &) = delete;
 
-  GBool matches(GfxState *state);
-  GBool matches(TextFontInfo *fontInfo);
+  GBool matches(GfxState *state) const;
+  GBool matches(const TextFontInfo *fontInfo) const;
 
   // Get the font ascent, or a default value if the font is not set
-  double getAscent();
+  double getAscent() const;
 
   // Get the font descent, or a default value if the font is not set
-  double getDescent();
+  double getDescent() const;
 
   // Get the writing mode (0 or 1), or 0 if the font is not set
-  int getWMode();
+  int getWMode() const;
 
 #ifdef TEXTOUT_WORD_LIST
   // Get the font name (which may be NULL).
-  GooString *getFontName() { return fontName; }
+  const GooString *getFontName() const { return fontName; }
 
   // Get font descriptor flags.
-  GBool isFixedWidth() { return flags & fontFixedWidth; }
-  GBool isSerif() { return flags & fontSerif; }
-  GBool isSymbolic() { return flags & fontSymbolic; }
-  GBool isItalic() { return flags & fontItalic; }
-  GBool isBold() { return flags & fontBold; }
+  GBool isFixedWidth() const { return flags & fontFixedWidth; }
+  GBool isSerif() const { return flags & fontSerif; }
+  GBool isSymbolic() const { return flags & fontSymbolic; }
+  GBool isItalic() const { return flags & fontItalic; }
+  GBool isBold() const { return flags & fontBold; }
 #endif
 
 private:
@@ -129,7 +129,7 @@ class TextWord {
 public:
 
   // Constructor.
-  TextWord(GfxState *state, int rotA, double fontSize);
+  TextWord(const GfxState *state, int rotA, double fontSize);
 
   // Destructor.
   ~TextWord();