Attachment #80863 for bug #104365

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





    if (options->antialias != CAIRO_ANTIALIAS_DEFAULT)
    {
	    FcPatternDel (pattern, FC_ANTIALIAS);
	{
	    FcPatternAddBool (pattern, FC_ANTIALIAS, options->antialias != CAIRO_ANTIALIAS_NONE);
	}
    }

    if (options->antialias != CAIRO_ANTIALIAS_DEFAULT)
    {
	if (FcPatternGet (pattern, FC_RGBA, 0, &v) == FcResultNoMatch)
	{
	    int rgba;
	    
	    if (options->antialias == CAIRO_ANTIALIAS_SUBPIXEL) {

	    } else {
		rgba = FC_RGBA_NONE;
	    }
	    FcPatternDel (pattern, FC_RGBA);
	    FcPatternAddInteger (pattern, FC_RGBA, rgba);
	}
    }

    if (options->hint_style != CAIRO_HINT_STYLE_DEFAULT)
    {
	    FcPatternDel (pattern, FC_HINTING);
	{
	    FcPatternAddBool (pattern, FC_HINTING, options->hint_style != CAIRO_HINT_STYLE_NONE);
	}

#ifdef FC_HINT_STYLE	
	if (FcPatternGet (pattern, FC_HINT_STYLE, 0, &v) == FcResultNoMatch)
	{
	    int hint_style;


		hint_style = FC_HINT_FULL;
		break;
	    }

	    FcPatternDel (pattern, FC_HINT_STYLE);
	    FcPatternAddInteger (pattern, FC_HINT_STYLE, hint_style);
	}
#endif	

Return to bug 104365

Lines 2384-2399 Link Here

(-)cairo-1.0.2.orig/src/cairo-ft-font.c (-12 / +5 lines)
2384		2384
2385	if (options->antialias != CAIRO_ANTIALIAS_DEFAULT)	2385	if (options->antialias != CAIRO_ANTIALIAS_DEFAULT)
2386	{	2386	{
2387	if (FcPatternGet (pattern, FC_ANTIALIAS, 0, &v) == FcResultNoMatch)	2387	FcPatternDel (pattern, FC_ANTIALIAS);
2388	{
2389	FcPatternAddBool (pattern, FC_ANTIALIAS, options->antialias != CAIRO_ANTIALIAS_NONE);	2388	FcPatternAddBool (pattern, FC_ANTIALIAS, options->antialias != CAIRO_ANTIALIAS_NONE);
2390	}
2391	}	2389	}
2392		2390
2393	if (options->antialias != CAIRO_ANTIALIAS_DEFAULT)	2391	if (options->antialias != CAIRO_ANTIALIAS_DEFAULT)
2394	{	2392	{
2395	if (FcPatternGet (pattern, FC_RGBA, 0, &v) == FcResultNoMatch)
2396	{
2397	int rgba;	2393	int rgba;
2398		2394
2399	if (options->antialias == CAIRO_ANTIALIAS_SUBPIXEL) {	2395	if (options->antialias == CAIRO_ANTIALIAS_SUBPIXEL) {
Lines 2416-2435 Link Here
2416	} else {	2412	} else {
2417	rgba = FC_RGBA_NONE;	2413	rgba = FC_RGBA_NONE;
2418	}	2414	}
2419		2415	FcPatternDel (pattern, FC_RGBA);
2420	FcPatternAddInteger (pattern, FC_RGBA, rgba);	2416	FcPatternAddInteger (pattern, FC_RGBA, rgba);
2421	}
2422	}	2417	}
2423		2418
2424	if (options->hint_style != CAIRO_HINT_STYLE_DEFAULT)	2419	if (options->hint_style != CAIRO_HINT_STYLE_DEFAULT)
2425	{	2420	{
2426	if (FcPatternGet (pattern, FC_HINTING, 0, &v) == FcResultNoMatch)	2421	FcPatternDel (pattern, FC_HINTING);
2427	{
2428	FcPatternAddBool (pattern, FC_HINTING, options->hint_style != CAIRO_HINT_STYLE_NONE);	2422	FcPatternAddBool (pattern, FC_HINTING, options->hint_style != CAIRO_HINT_STYLE_NONE);
2429	}
2430		2423
2431	#ifdef FC_HINT_STYLE	2424	#ifdef FC_HINT_STYLE
2432	if (FcPatternGet (pattern, FC_HINT_STYLE, 0, &v) == FcResultNoMatch)
2433	{	2425	{
2434	int hint_style;	2426	int hint_style;
2435		2427
Lines 2445-2451 Link Here
2445	hint_style = FC_HINT_FULL;	2437	hint_style = FC_HINT_FULL;
2446	break;	2438	break;
2447	}	2439	}
2448		2440
		2441	FcPatternDel (pattern, FC_HINT_STYLE);
2449	FcPatternAddInteger (pattern, FC_HINT_STYLE, hint_style);	2442	FcPatternAddInteger (pattern, FC_HINT_STYLE, hint_style);
2450	}	2443	}
2451	#endif	2444	#endif