Commit 817e123a authored by Adrian Johnson's avatar Adrian Johnson Committed by Carlos Garcia Campos

Don't compare print flag for non Type 3 fonts in cairo font cache

parent 68f8ade2
...@@ -79,7 +79,7 @@ CairoFont::~CairoFont() { ...@@ -79,7 +79,7 @@ CairoFont::~CairoFont() {
GBool GBool
CairoFont::matches(Ref &other, GBool printingA) { CairoFont::matches(Ref &other, GBool printingA) {
return (other.num == ref.num && other.gen == ref.gen && printing == printingA); return (other.num == ref.num && other.gen == ref.gen);
} }
cairo_font_face_t * cairo_font_face_t *
...@@ -704,6 +704,11 @@ CairoType3Font::CairoType3Font(Ref ref, ...@@ -704,6 +704,11 @@ CairoType3Font::CairoType3Font(Ref ref,
CairoType3Font::~CairoType3Font() { } CairoType3Font::~CairoType3Font() { }
GBool
CairoType3Font::matches(Ref &other, GBool printingA) {
return (other.num == ref.num && other.gen == ref.gen && printing == printingA);
}
//------------------------------------------------------------------------ //------------------------------------------------------------------------
// CairoFontEngine // CairoFontEngine
......
...@@ -50,7 +50,7 @@ public: ...@@ -50,7 +50,7 @@ public:
GBool printing); GBool printing);
virtual ~CairoFont(); virtual ~CairoFont();
GBool matches(Ref &other, GBool printing); virtual GBool matches(Ref &other, GBool printing);
cairo_font_face_t *getFontFace(void); cairo_font_face_t *getFontFace(void);
unsigned long getGlyph(CharCode code, Unicode *u, int uLen); unsigned long getGlyph(CharCode code, Unicode *u, int uLen);
double getSubstitutionCorrection(GfxFont *gfxFont); double getSubstitutionCorrection(GfxFont *gfxFont);
...@@ -89,6 +89,8 @@ public: ...@@ -89,6 +89,8 @@ public:
GBool printing); GBool printing);
virtual ~CairoType3Font(); virtual ~CairoType3Font();
virtual GBool matches(Ref &other, GBool printing);
private: private:
CairoType3Font(Ref ref, XRef *xref, Catalog *catalog, CairoType3Font(Ref ref, XRef *xref, Catalog *catalog,
cairo_font_face_t *cairo_font_face, cairo_font_face_t *cairo_font_face,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment