diff --git a/ChangeLog b/ChangeLog
index af1b1e9..8f2835f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+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>
 
 	* qt4/src/poppler-page.cc:
diff --git a/poppler/CairoFontEngine.cc b/poppler/CairoFontEngine.cc
index f81f235..f5ab8cb 100644
--- a/poppler/CairoFontEngine.cc
+++ b/poppler/CairoFontEngine.cc
@@ -9,7 +9,6 @@
 
 #include <config.h>
 
-#include <math.h>
 #include "config.h"
 #include <string.h>
 #include "CairoFontEngine.h"
@@ -19,11 +18,6 @@
 #include <fofi/FoFiType1C.h>
 #include "goo/gfile.h"
 #include "Error.h"
-#include "Gfx.h"
-#include "Page.h"
-#include "Parser.h"
-#include "Lexer.h"
-#include "CairoOutputDev.h"
 
 #ifdef USE_GCC_PRAGMAS
 #pragma implementation
@@ -33,261 +27,18 @@
   fwrite(data, 1, len, (FILE *)stream);
 }
 
-static void
-init_cairo_matrix(cairo_matrix_t *matrix, double *d)
-{
-  matrix->xx = d[0];
-  matrix->yx = -d[2];
-  matrix->xy = d[1];
-  matrix->yy = -d[3];
-  matrix->x0 = d[2] + d[4];
-  matrix->y0 = d[3] + d[5];
-}		  
-
-static cairo_user_data_key_t cairo_font_face_key;
-
 //------------------------------------------------------------------------
-// CairoType3Font
+// CairoFont
 //------------------------------------------------------------------------
 
-class CairoType3Font : public CairoFont {
-public:
-  CairoType3Font(GfxFont *gfxFont, XRef *xref);
-
-private:
-
-  Gfx8BitFont *gfxFont;
-
-  /* Static functions for implementing the cairo user font interface. */
-  static void *scaled_font_create (cairo_scaled_font_t        *scaled_font,
-				   const cairo_matrix_t       *font_matrix,
-				   const cairo_matrix_t       *ctm,
-				   const cairo_font_options_t *options,
-				   cairo_font_extents_t       *metrics);
-  static void scaled_font_destroy (void *closure);
-
-  static unsigned long ucs4_to_index(void              *closure,
-				     unsigned long      ucs4);
-
-  static cairo_status_t get_glyph_metrics(void                 *closure,
-					  unsigned long         index,
-					  cairo_font_options_t *font_options,
-					  cairo_text_extents_t *metrics);
-  
-  static cairo_status_t render_glyph(void                 *closure,
-				     unsigned long         index,
-				     cairo_font_options_t *font_options,
-				     cairo_t              *cr);
-
-  static cairo_user_font_backend_t font_backend;
-};
-
-cairo_user_font_backend_t CairoType3Font::font_backend = {
-  CairoType3Font::scaled_font_create,
-  CairoType3Font::scaled_font_destroy,  
-  CairoType3Font::ucs4_to_index,
-  CairoType3Font::get_glyph_metrics,  
-  CairoType3Font::render_glyph
-};
-
-CairoType3Font::CairoType3Font(GfxFont *gfxFontA, XRef *xref)
-  : CairoFont(gfxFontA, xref)
+static void cairo_font_face_destroy (void *data)
 {
-  this->gfxFont = (Gfx8BitFont *) gfxFontA;
-  cairo_font_face = cairo_user_font_face_create (&font_backend);
+  CairoFont *font = (CairoFont *) data;
 
-  printf ("created type3 font\n");
+  delete font;
 }
 
-void *
-CairoType3Font::scaled_font_create (cairo_scaled_font_t        *scaled_font,
-				    const cairo_matrix_t       *font_matrix,
-				    const cairo_matrix_t       *ctm,
-				    const cairo_font_options_t *options,
-				    cairo_font_extents_t       *metrics)
-{
-  return cairo_scaled_font_get_font_face (scaled_font);
-}
-
-void
-CairoType3Font::scaled_font_destroy (void *closure)
-{
-}
-
-unsigned long
-CairoType3Font::ucs4_to_index(void          *closure,
-			      unsigned long  ucs4)
-{
-  return 0;
-}
-
-cairo_status_t
-CairoType3Font::get_glyph_metrics(void                 *closure,
-				  unsigned long         index,
-				  cairo_font_options_t *font_options,
-				  cairo_text_extents_t *metrics)
-{
-  CairoType3Font *font;
-  double *bbox;
-  Object charProc, obj;
-  Object argObjs[maxArgs];
-  Parser *parser;
-  char *name;
-  double args[maxArgs];
-  int i, numArgs;
-  cairo_matrix_t font_matrix;
-  cairo_font_face_t *face = (cairo_font_face_t *) closure;
-
-  font = (CairoType3Font *)
-    cairo_font_face_get_user_data (face, &cairo_font_face_key);
-
-  font->gfxFont->getCharProc(index, &charProc);
-  if (!charProc.isStream()) {
-      charProc.free();
-      return CAIRO_STATUS_SUCCESS;
-  }
-  parser = new Parser(font->xref, new Lexer(font->xref, &charProc));
-
-  numArgs = 0;
-  parser->getObj(&obj);
-  while (!obj.isEOF()) {
-
-    // got a command - execute it
-    if (obj.isCmd()) {
-
-      name = obj.getCmd();
-      if (strcmp(name, "d0") == 0) {
-	/* FIXME: Handle d0 glyphs. */
-      } else if (strcmp(name, "d1") == 0) {
-	if (numArgs < 6)
-	  goto cont;
-	for (i = 0; i < 6; i++) {
-	  if (!argObjs[numArgs - 6 + i].isNum())
-	    goto cont;
-	  args[i] = argObjs[numArgs - 6 + i].getNum();
-	}
-
-	/* Transform glyph coordinates to text coordinates, which is
-	 * what cairo expects. */
-	init_cairo_matrix (&font_matrix, font->gfxFont->getFontMatrix());
-	cairo_matrix_transform_distance (&font_matrix, &args[0], &args[1]);
-	cairo_matrix_transform_distance (&font_matrix, &args[2], &args[3]);
-	cairo_matrix_transform_distance (&font_matrix, &args[4], &args[5]);
-
-	metrics->x_bearing = args[2];
-	metrics->y_bearing = args[5];
-	metrics->width = args[4] - args[2];
-	metrics->height = args[3] - args[5];
-	metrics->x_advance = args[0];
-	metrics->y_advance = args[1];
-
-	break;
-      }
-    cont:
-      obj.free();
-      for (i = 0; i < numArgs; ++i)
-	argObjs[i].free();
-      numArgs = 0;
-    } else if (numArgs < maxArgs) {
-      argObjs[numArgs++] = obj;
-    }
-
-    parser->getObj(&obj);
-  }
-  obj.free();
-  for (i = 0; i < numArgs; ++i)
-    argObjs[i].free();
-
-  delete parser;
-
-  return CAIRO_STATUS_SUCCESS;
-}
-
-cairo_status_t
-CairoType3Font::render_glyph(void                 *closure,
-			     unsigned long         index,
-			     cairo_font_options_t *font_options,
-			     cairo_t              *cr)
-{
-  Dict *resources;
-  Gfx *gfx;
-  Object charProc;
-  CairoOutputDev *out;
-  CairoType3Font *font;
-  cairo_matrix_t font_matrix;
-  cairo_font_face_t *face = (cairo_font_face_t *) closure;
-
-  cairo_surface_t *target;
-  int width, height;
-
-  target = cairo_get_target (cr);
-  width = cairo_image_surface_get_width (target);
-  height = cairo_image_surface_get_height (target);
-  PDFRectangle box(0, 0, width, height);
-
-  font = (CairoType3Font *)
-    cairo_font_face_get_user_data (face, &cairo_font_face_key);
-
-  out = new CairoOutputDev();
-  out->setCairo(cr);
-  resources = font->gfxFont->getResources();
-
-  gfx = new Gfx(font->xref, out, resources, &box, NULL);
-
-  font->gfxFont->getCharProc(index, &charProc);
-
-  cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
-  cairo_set_source_rgba (cr, 0, 0, 0, 0);
-  cairo_paint (cr);
-  cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
-
-  cairo_move_to (cr, -10, 0);
-  cairo_line_to (cr, 10, 0);
-  cairo_move_to (cr, 0, -10);
-  cairo_line_to (cr, 0, 10);
-  cairo_move_to (cr, -10, -10);
-  cairo_line_to (cr, 10, 10);
-  cairo_move_to (cr, 10, -10);
-  cairo_line_to (cr, -10, 10);
-  cairo_set_line_width (cr, 5);
-  cairo_stroke (cr);
-
-  init_cairo_matrix(&font_matrix, font->gfxFont->getFontMatrix());
-  cairo_transform (cr, &font_matrix);
-
-  if (charProc.isStream()) {
-    gfx->display(&charProc, gFalse);
-  } else {
-    error(-1, "Missing or bad Type3 CharProc entry");
-  }
-
-  delete gfx;
-  delete out;
-
-  return CAIRO_STATUS_SUCCESS;
-}
-
-//------------------------------------------------------------------------
-// CairoFTFont
-//------------------------------------------------------------------------
-
-class CairoFTFont : public CairoFont {
-public:
-  CairoFTFont(GfxFont *gfxFont, XRef *xref, FT_Library lib, GBool useCIDs);
-  virtual ~CairoFTFont();
-
-  GBool matches(Ref &other);
-  cairo_font_face_t *getFontFace(void);
-  unsigned long getGlyph(CharCode code, Unicode *u, int uLen);
-
-private:
-  FT_Face face;
-};
-
-CairoFTFont::CairoFTFont(GfxFont *gfxFont, XRef *xref,
-			 FT_Library lib, GBool useCIDs)
-  : CairoFont(gfxFont, xref)
-{
+CairoFont::CairoFont(GfxFont *gfxFont, XRef *xref, FT_Library lib, GBool useCIDs) {
   Ref embRef;
   Object refObj, strObj;
   GooString *tmpFileName, *fileName, *substName,*tmpFileName2;
@@ -301,8 +52,14 @@
   FoFiType1C *ff1c;
   CharCodeToUnicode *ctu;
   Unicode uBuf[8];
+  static cairo_user_data_key_t cairo_font_face_key;
   
   dfp = NULL;
+  codeToGID = NULL;
+  codeToGIDLen = 0;
+  cairo_font_face = NULL;
+  
+  ref = *gfxFont->getID();
   fontType = gfxFont->getType();
 
   tmpFileName = NULL;
@@ -462,7 +219,7 @@
       goto err2;
     }
     break;
-
+    
   default:
     printf ("font type not handled\n");
     goto err2;
@@ -480,63 +237,25 @@
   cairo_font_face = cairo_ft_font_face_create_for_ft_face (face,
 							   FT_LOAD_NO_HINTING |
 							   FT_LOAD_NO_BITMAP);
+  if (cairo_font_face == NULL) {
+    error(-1, "could not create cairo font\n");
+    goto err2; /* this doesn't do anything, but it looks like we're
+		* handling the error */
+  }
+
+  cairo_font_face_set_user_data (cairo_font_face, 
+				 &cairo_font_face_key,
+				 this,
+				 cairo_font_face_destroy);
+
   return;
  err2:
   /* hmm? */
   printf ("some font thing failed\n");
 }
 
-CairoFTFont::~CairoFTFont() {
+CairoFont::~CairoFont() {
   FT_Done_Face (face);
-}
-
-//------------------------------------------------------------------------
-// CairoFont
-//------------------------------------------------------------------------
-
-void cairo_font_destroy (void *data)
-{
-  CairoFont *font = (CairoFont *) data;
-
-  font->unreference();
-}
-
-CairoFont *
-CairoFont::create(GfxFont *gfxFont, XRef *xref, FT_Library lib, GBool useCIDs)
-{
-  CairoFont *font;
-
-  switch (gfxFont->getType()) {
-  case fontType3:
-    font = new CairoType3Font(gfxFont, xref);
-    break;
-  default:
-    font = new CairoFTFont(gfxFont, xref, lib, useCIDs);
-    break;
-  }
-
-  if (font->cairo_font_face == NULL)
-    error(-1, "could not create cairo font\n");
-  else
-    cairo_font_face_set_user_data (font->cairo_font_face, 
-				   &cairo_font_face_key,
-				   font->reference(),
-				   cairo_font_destroy);
-
-  return font;
-}
-
-CairoFont::CairoFont(GfxFont *gfxFont, XRef *xrefA)
-{
-  codeToGID = NULL;
-  codeToGIDLen = 0;
-  ref = *gfxFont->getID();
-  xref = xrefA;
-  refcount = 1;
-}
-
-CairoFont::~CairoFont()
-{
   gfree(codeToGID);
 }
 
@@ -555,7 +274,7 @@
 		    Unicode *u, int uLen) {
   FT_UInt gid;
 
-  if (codeToGID && code < (unsigned) codeToGIDLen) {
+  if (codeToGID && code < codeToGIDLen) {
     gid = (FT_UInt)codeToGID[code];
   } else {
     gid = (FT_UInt)code;
@@ -563,8 +282,6 @@
   return gid;
 }
 
-
-
 //------------------------------------------------------------------------
 // CairoFontEngine
 //------------------------------------------------------------------------
@@ -589,7 +306,7 @@
   
   for (i = 0; i < cairoFontCacheSize; ++i) {
     if (fontCache[i])
-      fontCache[i]->unreference();
+      delete fontCache[i];
   }
 }
 
@@ -598,6 +315,13 @@
   int i, j;
   Ref ref;
   CairoFont *font;
+  GfxFontType fontType;
+  
+  fontType = gfxFont->getType();
+  if (fontType == fontType3) {
+    /* Need to figure this out later */
+    //    return NULL;
+  }
 
   ref = *gfxFont->getID();
 
@@ -612,9 +336,9 @@
     }
   }
   
-  font = CairoFont::create (gfxFont, xref, lib, useCIDs);
+  font = new CairoFont (gfxFont, xref, lib, useCIDs);
   if (fontCache[cairoFontCacheSize - 1]) {
-    fontCache[cairoFontCacheSize - 1]->unreference();
+    delete fontCache[cairoFontCacheSize - 1];
   }
   for (j = cairoFontCacheSize - 1; j > 0; --j) {
     fontCache[j] = fontCache[j-1];
@@ -622,3 +346,4 @@
   fontCache[0] = font;
   return font;
 }
+
diff --git a/poppler/CairoFontEngine.h b/poppler/CairoFontEngine.h
index 8cfac6f..2df4e02 100644
--- a/poppler/CairoFontEngine.h
+++ b/poppler/CairoFontEngine.h
@@ -18,26 +18,19 @@
 
 class CairoFont {
 public:
-  static CairoFont *create(GfxFont *gfxFont, XRef *xref,
-			   FT_Library lib, GBool useCIDs);
-
-  CairoFont *reference() { refcount++; return this; }
-  void unreference() { if (--refcount == 0) delete this; }
+  CairoFont(GfxFont *gfxFont, XRef *xref, FT_Library lib, GBool useCIDs);
+  ~CairoFont();
 
   GBool matches(Ref &other);
   cairo_font_face_t *getFontFace(void);
   unsigned long getGlyph(CharCode code, Unicode *u, int uLen);
-
-protected:
-  CairoFont(GfxFont *gfxFont, XRef *xref);
-  virtual ~CairoFont();
-
+private:
   Ref ref;
-  XRef *xref;
   cairo_font_face_t *cairo_font_face;
+  FT_Face face;
+
   Gushort *codeToGID;
   int codeToGIDLen;
-  int refcount;
 };
 
 //------------------------------------------------------------------------