Index: src/doc/PdfFontFactory.cpp
===================================================================
--- src/doc/PdfFontFactory.cpp	(revision 1949)
+++ src/doc/PdfFontFactory.cpp	(working copy)
@@ -253,7 +253,7 @@
            PdfObject* pBaseFont = NULL;
            pBaseFont = pObject->GetIndirectKey( "BaseFont" );
            const char* pszBaseFontName = pBaseFont->GetName().GetName().c_str();
-           PdfFontMetricsBase14* pMetrics = PODOFO_Base14FontDef_FindBuiltinData(pszBaseFontName);
+           PdfFontMetricsBase14* pMetrics = new PdfFontMetricsBase14(*PODOFO_Base14FontDef_FindBuiltinData(pszBaseFontName));
            if ( pMetrics != NULL )
            {
                // pEncoding may be undefined, found a valid pdf with
@@ -361,7 +361,7 @@
 }
 
 
-PdfFontMetricsBase14*
+const PdfFontMetricsBase14*
 PODOFO_Base14FontDef_FindBuiltinData(const char  *font_name)
 {
     unsigned int i = 0;
@@ -384,7 +384,7 @@
                     PdfVecObjects *pParent)
 {
     PdfFont *pFont = new PdfFontType1Base14(
-        PODOFO_Base14FontDef_FindBuiltinData(pszFontName), pEncoding, pParent);
+        new PdfFontMetricsBase14(*PODOFO_Base14FontDef_FindBuiltinData(pszFontName)), pEncoding, pParent);
     if (pFont) {
         pFont->SetBold( eFlags & ePdfFont_Bold ? true : false );
         pFont->SetItalic( eFlags & ePdfFont_Italic ? true : false );
Index: src/doc/PdfFontFactoryBase14Data.h
===================================================================
--- src/doc/PdfFontFactoryBase14Data.h	(revision 1949)
+++ src/doc/PdfFontFactoryBase14Data.h	(working copy)
@@ -4457,7 +4457,7 @@
 };	 
 */
 
-static   PdfFontMetricsBase14   PODOFO_BUILTIN_FONTS[] = {
+static const   PdfFontMetricsBase14   PODOFO_BUILTIN_FONTS[] = {
     PdfFontMetricsBase14(
         PODOFO_HPDF_FONT_COURIER,
         CHAR_DATA_COURIER,
Index: src/doc/PdfFontMetricsBase14.h
===================================================================
--- src/doc/PdfFontMetricsBase14.h	(revision 1949)
+++ src/doc/PdfFontMetricsBase14.h	(working copy)
@@ -83,7 +83,7 @@
 
     ~PdfFontMetricsBase14();
 
-	friend  PdfFontMetricsBase14*
+	friend  const PdfFontMetricsBase14*
 		PODOFO_Base14FontDef_FindBuiltinData  (const char  *font_name);
 
     /** Create a width array for this font which is a required part
@@ -280,7 +280,7 @@
 };
 
 
-PdfFontMetricsBase14*
+const PdfFontMetricsBase14*
 PODOFO_Base14FontDef_FindBuiltinData  (const char  *font_name);
 
 // -----------------------------------------------------
Index: src/doc/PdfFontType1Base14.cpp
===================================================================
--- src/doc/PdfFontType1Base14.cpp	(revision 1949)
+++ src/doc/PdfFontType1Base14.cpp	(working copy)
@@ -57,12 +57,6 @@
     InitBase14Font( pMetrics );
 }
 
-PdfFontType1Base14::~PdfFontType1Base14()
-{
-    // FontMetrics of base14 fonts may not be deleted
-    m_pMetrics = NULL;
-}
-
 /*
 kausik : April 12th 2010
 This is the font dictionary. It gets added to the page resources dictionary of the pdf.
Index: src/doc/PdfFontType1Base14.h
===================================================================
--- src/doc/PdfFontType1Base14.h	(revision 1949)
+++ src/doc/PdfFontType1Base14.h	(working copy)
@@ -69,8 +69,6 @@
     PdfFontType1Base14( PdfFontMetrics* pMetrics, const PdfEncoding* const pEncoding, 
                   PdfObject* pObject );
 
-    ~PdfFontType1Base14();
-
  protected:
     /** Embed the font file directly into the PDF file.
      *