Attachment #3238 for bug #18560

View | Details | Raw Unified | Return to bug 18560
Collapse All | Expand All




    antialias = true;
    default_load_flags = 0;
    subpixelType = Subpixel_None;
    lcdfilter = 1;
    defaultGlyphFormat = Format_None;
    canUploadGlyphsToServer = false;
}


    FT_GlyphSlot slot = face->glyph;

    FT_LcdFilter lcd_filter;
    switch (lcdfilter) {
        case 0: lcd_filter = FT_LCD_FILTER_NONE; break;
        case 1:
        default:
            lcd_filter = FT_LCD_FILTER_DEFAULT; break;
        case 2: lcd_filter = FT_LCD_FILTER_LIGHT; break;
        case 3: lcd_filter = FT_LCD_FILTER_LEGACY; break;
    }

    if (slot->format != FT_GLYPH_FORMAT_BITMAP) {
        FT_Library  library = slot->library;
        FT_Library_SetLcdFilter( library, lcd_filter );
        FT_Render_Glyph( slot, mode );
        FT_Library_SetLcdFilter( library, FT_LCD_FILTER_NONE );
    }

Lines 272-277 Link Here

(-)qt-x11-opensource-src-4.4.0/src/gui/text/qfontengine_ft_p.h (+1 lines)
272	QFreetypeFace *freetype;	272	QFreetypeFace *freetype;
273	int default_load_flags;	273	int default_load_flags;
274		274
		275	int lcdfilter;
275	bool antialias;	276	bool antialias;
276	bool outline_drawing;	277	bool outline_drawing;
277	bool transform;	278	bool transform;




    }
#endif

#ifndef FC_LCD_FILTER
#define FC_LCD_FILTER       "lcdfilter"
#define FC_LCD_NONE         0
#define FC_LCD_DEFAULT      1
#define FC_LCD_LIGHT        2
#define FC_LCD_LEGACY       3
#endif // FC_LCD_FILTER

    if (FcPatternGetInteger (pattern, FC_LCD_FILTER, 0, &lcdfilter) == FcResultNoMatch)
        lcdfilter = FC_LCD_DEFAULT;

    GlyphFormat defaultFormat = Format_None;

#ifndef QT_NO_XRENDER

Return to bug 18560

Lines 804-809 Link Here

(-)qt-x11-opensource-src-4.4.0/src/gui/text/qfontengine_ft.cpp (-1 / +12 lines)
804	antialias = true;	804	antialias = true;
805	default_load_flags = 0;	805	default_load_flags = 0;
806	subpixelType = Subpixel_None;	806	subpixelType = Subpixel_None;
		807	lcdfilter = 1;
807	defaultGlyphFormat = Format_None;	808	defaultGlyphFormat = Format_None;
808	canUploadGlyphsToServer = false;	809	canUploadGlyphsToServer = false;
809	}	810	}
Lines 964-972 Link Here
964		965
965	FT_GlyphSlot slot = face->glyph;	966	FT_GlyphSlot slot = face->glyph;
966		967
		968	FT_LcdFilter lcd_filter;
		969	switch (lcdfilter) {
		970	case 0: lcd_filter = FT_LCD_FILTER_NONE; break;
		971	case 1:
		972	default:
		973	lcd_filter = FT_LCD_FILTER_DEFAULT; break;
		974	case 2: lcd_filter = FT_LCD_FILTER_LIGHT; break;
		975	case 3: lcd_filter = FT_LCD_FILTER_LEGACY; break;
		976	}
		977
967	if (slot->format != FT_GLYPH_FORMAT_BITMAP) {	978	if (slot->format != FT_GLYPH_FORMAT_BITMAP) {
968	FT_Library library = slot->library;	979	FT_Library library = slot->library;
969	FT_Library_SetLcdFilter( library, FT_LCD_FILTER_DEFAULT );	980	FT_Library_SetLcdFilter( library, lcd_filter );
970	FT_Render_Glyph( slot, mode );	981	FT_Render_Glyph( slot, mode );
971	FT_Library_SetLcdFilter( library, FT_LCD_FILTER_NONE );	982	FT_Library_SetLcdFilter( library, FT_LCD_FILTER_NONE );
972	}	983	}

Lines 965-970 Link Here

(-)qt-x11-opensource-src-4.4.0/src/gui/text/qfontengine_x11.cpp (+11 lines)
965	}	965	}
966	#endif	966	#endif
967		967
		968	#ifndef FC_LCD_FILTER
		969	#define FC_LCD_FILTER "lcdfilter"
		970	#define FC_LCD_NONE 0
		971	#define FC_LCD_DEFAULT 1
		972	#define FC_LCD_LIGHT 2
		973	#define FC_LCD_LEGACY 3
		974	#endif // FC_LCD_FILTER
		975
		976	if (FcPatternGetInteger (pattern, FC_LCD_FILTER, 0, &lcdfilter) == FcResultNoMatch)
		977	lcdfilter = FC_LCD_DEFAULT;
		978
968	GlyphFormat defaultFormat = Format_None;	979	GlyphFormat defaultFormat = Format_None;
969		980
970	#ifndef QT_NO_XRENDER	981	#ifndef QT_NO_XRENDER