partial fix for #1504

diff --git a/lib/common/ps_font_equiv.txt b/lib/common/ps_font_equiv.txt
index ffda1d226a409398438cfe09f42dde1ab21358e8..5986b35f5b25adeee411f835696c1cbde57f203d 100644 (file)
--- a/lib/common/ps_font_equiv.txt
+++ b/lib/common/ps_font_equiv.txt
@@ -27,7 +27,7 @@
 {"Palatino-Italic",            PALATINO,               0,              0,              "italic",       29},
 {"Palatino-Roman",             PALATINO,               "roman",        0,              0,              28},
 {"Symbol",                     SYMBOL,                 0,              0,              0,              32},
-{"Times-Bold",                 TIMES,                  "medium",       0,              0,              2 },
+{"Times-Bold",                 "Times",                "bold",         0,              0,              2 },
 {"Times-BoldItalic",           TIMES,                  "medium",       0,              "italic",       3 },
 {"Times-Italic",               TIMES,                  0,              0,              "italic",       1 },
 {"Times-Roman",                        TIMES,                  0,              0,              0,              0 },

diff --git a/plugin/gd/gvrender_gd.c b/plugin/gd/gvrender_gd.c
index 386ca49024e89700ac22fc6b55ee52b73b18f136..a5f218ee155510738f668a6982a3813b5248ce90 100644 (file)
--- a/plugin/gd/gvrender_gd.c
+++ b/plugin/gd/gvrender_gd.c
@@ -351,7 +351,7 @@ void gdgen_text(gdImagePtr im, pointf spf, pointf epf, int fontcolor, double fon
     }
 }
 
-extern char* psfontResolve (PostscriptAlias* pa);
+extern char* gd_psfontResolve (PostscriptAlias* pa);
 
 static void gdgen_textpara(GVJ_t * job, pointf p, textpara_t * para)
 {
@@ -390,7 +390,7 @@ static void gdgen_textpara(GVJ_t * job, pointf p, textpara_t * para)
 
 #ifdef HAVE_GD_FONTCONFIG
     if (para->postscript_alias)
-       fontname = psfontResolve (para->postscript_alias);
+       fontname = gd_psfontResolve (para->postscript_alias);
     else
 #endif
        fontname = para->fontname;