Attachment #3236 for bug #18560

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




    int load_flags = FT_LOAD_DEFAULT | default_load_flags;
    if (outline_drawing) {
        load_flags = FT_LOAD_NO_BITMAP;
    } else if (format == Format_Mono) {
        load_flags |= FT_LOAD_TARGET_MONO;
    } else if (format == Format_A32) {
        if (subpixelType == QFontEngineFT::Subpixel_RGB || subpixelType == QFontEngineFT::Subpixel_BGR) {
            load_flags |= FT_LOAD_TARGET_LCD;
            hsubpixel = true;
        } else if (subpixelType == QFontEngineFT::Subpixel_VRGB || subpixelType == QFontEngineFT::Subpixel_VBGR) {
            load_flags |= FT_LOAD_TARGET_LCD_V;
            vfactor = 3;
        }





            case FC_RGBA_VBGR: subpixelType = Subpixel_VBGR; break;
            default: break;
        }
    }

#ifdef FC_HINT_STYLE
        {
            int hint_style = 0;
            if (FcPatternGetInteger (pattern, FC_HINT_STYLE, 0, &hint_style) == FcResultNoMatch)
                hint_style = X11->fc_hint_style;

            switch (hint_style) {
                case FC_HINT_NONE: default_load_flags |= FT_LOAD_NO_HINTING; break;
                case FC_HINT_SLIGHT: default_load_flags |= FT_LOAD_TARGET_LIGHT; break;
                case FC_HINT_MEDIUM:
                default:
                    break;
                case FC_HINT_FULL:
                    switch (subpixelType) {
                        case Subpixel_None: break;
                        case Subpixel_RGB:
                        case Subpixel_BGR:
                            default_load_flags |= FT_LOAD_TARGET_LCD; break;
                        case Subpixel_VRGB:
                        case Subpixel_VBGR:
                            default_load_flags |= FT_LOAD_TARGET_LCD_V; break;
                    }
            }
        }
#endif
    }
    else
        default_load_flags |= FT_LOAD_TARGET_MONO;

#if defined(FC_AUTOHINT) && defined(FT_LOAD_FORCE_AUTOHINT)
    {

Return to bug 18560

Lines 636-649 Link Here

(-)qt-x11-opensource-src-4.4.0/src/gui/text/qfontengine_ft.cpp (-4 lines)
636	int load_flags = FT_LOAD_DEFAULT \| default_load_flags;	636	int load_flags = FT_LOAD_DEFAULT \| default_load_flags;
637	if (outline_drawing) {	637	if (outline_drawing) {
638	load_flags = FT_LOAD_NO_BITMAP;	638	load_flags = FT_LOAD_NO_BITMAP;
639	} else if (format == Format_Mono) {
640	load_flags \|= FT_LOAD_TARGET_MONO;
641	} else if (format == Format_A32) {	639	} else if (format == Format_A32) {
642	if (subpixelType == QFontEngineFT::Subpixel_RGB \|\| subpixelType == QFontEngineFT::Subpixel_BGR) {	640	if (subpixelType == QFontEngineFT::Subpixel_RGB \|\| subpixelType == QFontEngineFT::Subpixel_BGR) {
643	load_flags \|= FT_LOAD_TARGET_LCD;
644	hsubpixel = true;	641	hsubpixel = true;
645	} else if (subpixelType == QFontEngineFT::Subpixel_VRGB \|\| subpixelType == QFontEngineFT::Subpixel_VBGR) {	642	} else if (subpixelType == QFontEngineFT::Subpixel_VRGB \|\| subpixelType == QFontEngineFT::Subpixel_VBGR) {
646	load_flags \|= FT_LOAD_TARGET_LCD_V;
647	vfactor = 3;	643	vfactor = 3;
648	}	644	}
649		645

Lines 923-941 Link Here

(-)qt-x11-opensource-src-4.4.0/src/gui/text/qfontengine_x11.cpp (-11 / +26 lines)
923	case FC_RGBA_VBGR: subpixelType = Subpixel_VBGR; break;	923	case FC_RGBA_VBGR: subpixelType = Subpixel_VBGR; break;
924	default: break;	924	default: break;
925	}	925	}
926	}
927
928	#ifdef FC_HINT_STYLE	926	#ifdef FC_HINT_STYLE
929	{	927	{
930	int hint_style = 0;	928	int hint_style = 0;
931	if (FcPatternGetInteger (pattern, FC_HINT_STYLE, 0, &hint_style) == FcResultNoMatch)	929	if (FcPatternGetInteger (pattern, FC_HINT_STYLE, 0, &hint_style) == FcResultNoMatch)
932	hint_style = X11->fc_hint_style;	930	hint_style = X11->fc_hint_style;
933	if (hint_style == FC_HINT_NONE)	931
934	default_load_flags \|= FT_LOAD_NO_HINTING;	932	switch (hint_style) {
935	else if (hint_style < FC_HINT_FULL)	933	case FC_HINT_NONE: default_load_flags \|= FT_LOAD_NO_HINTING; break;
936	default_load_flags \|= FT_LOAD_TARGET_LIGHT;	934	case FC_HINT_SLIGHT: default_load_flags \|= FT_LOAD_TARGET_LIGHT; break;
937	}	935	case FC_HINT_MEDIUM:
		936	default:
		937	break;
		938	case FC_HINT_FULL:
		939	switch (subpixelType) {
		940	case Subpixel_None: break;
		941	case Subpixel_RGB:
		942	case Subpixel_BGR:
		943	default_load_flags \|= FT_LOAD_TARGET_LCD; break;
		944	case Subpixel_VRGB:
		945	case Subpixel_VBGR:
		946	default_load_flags \|= FT_LOAD_TARGET_LCD_V; break;
		947	}
		948	}
		949	}
938	#endif	950	#endif
		951	}
		952	else
		953	default_load_flags \|= FT_LOAD_TARGET_MONO;
939		954
940	#if defined(FC_AUTOHINT) && defined(FT_LOAD_FORCE_AUTOHINT)	955	#if defined(FC_AUTOHINT) && defined(FT_LOAD_FORCE_AUTOHINT)
941	{	956	{