Merge xpdf 3.00 -> 3.01 changes in SplashFont.* files

1 files changed, 9 insertions, 1 deletions

diff --git a/splash/SplashFont.h b/splash/SplashFont.h
index f8e8de36..59bc14e4 100644
--- a/splash/SplashFont.h
+++ b/splash/SplashFont.h
@@ -25,7 +25,8 @@ class SplashPath;
 // decimal points.
 #define splashFontFractionBits 2
 #define splashFontFraction     (1 << splashFontFractionBits)
-#define splashFontFractionMul  (1 / (SplashCoord)splashFontFraction)
+#define splashFontFractionMul \
+                       ((SplashCoord)1 / (SplashCoord)splashFontFraction)
 
 //------------------------------------------------------------------------
 // SplashFont
@@ -69,6 +70,13 @@ public:
   // Return the path for a glyph.
   virtual SplashPath *getGlyphPath(int c) = 0;
 
+  // Return the font transform matrix.
+  SplashCoord *getMatrix() { return mat; }
+
+  // Return the glyph bounding box.
+  void getBBox(int *xMinA, int *yMinA, int *xMaxA, int *yMaxA)
+    { *xMinA = xMin; *yMinA = yMin; *xMaxA = xMax; *yMaxA = yMax; }
+
 protected:
 
   SplashFontFile *fontFile;