Commit e43a06bf authored by Kristian Høgsberg's avatar Kristian Høgsberg

2006-05-21 Kristian Høgsberg <krh@redhat.com>

	* poppler/CairoFontEngine.cc:
	* poppler/CairoFontEngine.h: Back out type3 font work committed by
	accident.
parent 7d4bb053
2006-05-21 Kristian Høgsberg <krh@redhat.com>
* poppler/CairoFontEngine.cc:
* poppler/CairoFontEngine.h: Back out type3 font work committed by
accident.
2006-05-21 Albert Astals Cid <aacid@kde.org> 2006-05-21 Albert Astals Cid <aacid@kde.org>
* qt4/src/poppler-page.cc: * qt4/src/poppler-page.cc:
......
This diff is collapsed.
...@@ -18,26 +18,19 @@ ...@@ -18,26 +18,19 @@
class CairoFont { class CairoFont {
public: public:
static CairoFont *create(GfxFont *gfxFont, XRef *xref, CairoFont(GfxFont *gfxFont, XRef *xref, FT_Library lib, GBool useCIDs);
FT_Library lib, GBool useCIDs); ~CairoFont();
CairoFont *reference() { refcount++; return this; }
void unreference() { if (--refcount == 0) delete this; }
GBool matches(Ref &other); GBool matches(Ref &other);
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);
private:
protected:
CairoFont(GfxFont *gfxFont, XRef *xref);
virtual ~CairoFont();
Ref ref; Ref ref;
XRef *xref;
cairo_font_face_t *cairo_font_face; cairo_font_face_t *cairo_font_face;
FT_Face face;
Gushort *codeToGID; Gushort *codeToGID;
int codeToGIDLen; int codeToGIDLen;
int refcount;
}; };
//------------------------------------------------------------------------ //------------------------------------------------------------------------
......
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