From 730f2d12b275552cc142970f4f8a6a21e1beb5f0 Mon Sep 17 00:00:00 2001 From: Manolo Gouy Date: Wed, 30 Mar 2016 16:27:41 +0000 Subject: Continue removing platform-dependent code from Fl_PostScript.cxx git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11476 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- src/drivers/PostScript/Fl_PostScript.cxx | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) (limited to 'src/drivers/PostScript') diff --git a/src/drivers/PostScript/Fl_PostScript.cxx b/src/drivers/PostScript/Fl_PostScript.cxx index 003f39807..9027faca4 100644 --- a/src/drivers/PostScript/Fl_PostScript.cxx +++ b/src/drivers/PostScript/Fl_PostScript.cxx @@ -953,25 +953,8 @@ void Fl_PostScript_Graphics_Driver::font(int f, int s) { Fl_Font_Descriptor *desc = driver->font_descriptor(); this->font_descriptor(desc); if (f < FL_FREE_FONT) { - float ps_size = (float) s; fprintf(output, "/%s SF\n" , _fontNames[f]); -#if defined(USE_X11) -#if USE_XFT - // Xft font height is sometimes larger than the required size (see STR 2566). - // Increase the PostScript font size by 15% without exceeding the display font height - int max = desc->font->height; - ps_size = s * 1.15; - if (ps_size > max) ps_size = max; -#else - // Non-Xft fonts can be smaller than required. - // Set the PostScript font size to the display font height - char *name = desc->font->font_name_list[0]; - char *p = strstr(name, "--"); - if (p) { - sscanf(p + 2, "%f", &ps_size); - } -#endif // USE_XFT -#endif // USE_X11 + float ps_size = driver->scale_font_for_PostScript(desc, s); clocale_printf("%.1f FS\n", ps_size); } } -- cgit v1.2.3