From f61dfc3c05000be44e873b3f36b6979785ad4488 Mon Sep 17 00:00:00 2001 From: ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> Date: Tue, 26 Jul 2022 10:01:51 +0200 Subject: Remove redundant Fl_Xlib_Graphics_Driver::scale_bitmap_for_PostScript() under USE_XFT=1. --- src/drivers/Xlib/Fl_Xlib_Graphics_Driver.H | 2 +- src/drivers/Xlib/Fl_Xlib_Graphics_Driver_font_xft.cxx | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) (limited to 'src') diff --git a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver.H b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver.H index be36049f7..016da8f23 100644 --- a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver.H +++ b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver.H @@ -204,11 +204,11 @@ protected: Fl_Color color() { return color_; } void color(uchar r, uchar g, uchar b); virtual float scale_font_for_PostScript(Fl_Font_Descriptor *desc, int s); - virtual float scale_bitmap_for_PostScript(); virtual const char* get_font_name(Fl_Font fnum, int* ap); virtual int get_font_sizes(Fl_Font fnum, int*& sizep); #if !USE_XFT virtual unsigned font_desc_size(); + virtual float scale_bitmap_for_PostScript(); #endif virtual const char *font_name(int num); virtual void font_name(int num, const char *name); diff --git a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_font_xft.cxx b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_font_xft.cxx index 723706f9b..301ad2833 100644 --- a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_font_xft.cxx +++ b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_font_xft.cxx @@ -907,10 +907,6 @@ const char* Fl_Xlib_Graphics_Driver::get_font_name(Fl_Font fnum, int* ap) { return f->fontname; } -float Fl_Xlib_Graphics_Driver::scale_bitmap_for_PostScript() { - return 2; -} - Fl_Xlib_Font_Descriptor::~Fl_Xlib_Font_Descriptor() { if (this == fl_graphics_driver->font_descriptor()) fl_graphics_driver->font_descriptor(NULL); // XftFontClose(fl_display, font); -- cgit v1.2.3