comparison libvo/font_load_ft.c @ 23338:2a66d95355f0

add new -subfont option, that allows having a different font for OSD (controls and menu) and subtitles

23337:10a7279b8e56

int kerning(font_desc_t *desc, int prevc, int c)
{
    FT_Vector kern;
    
    if (!vo_font->dynamic) return 0;
    if (prevc < 0 || c < 0) return 0;
    if (desc->font[prevc] != desc->font[c]) return 0;
    if (desc->font[prevc] == -1 || desc->font[c] == -1) return 0;
    FT_Get_Kerning(desc->faces[desc->font[c]], 
		   desc->glyph_index[prevc], desc->glyph_index[c],

    }

    return 0;
}

void load_font_ft(int width, int height) 
{
#ifdef HAVE_FONTCONFIG
    FcPattern *fc_pattern;
    FcPattern *fc_pattern2;
    FcChar8 *s;
    FcBool scalable;
#endif
    vo_image_width = width;
    vo_image_height = height;

    // protection against vo_aa font hacks
    if (vo_font && !vo_font->dynamic) return;

    	    fc_pattern = FcFontMatch(0, fc_pattern, 0);
	    FcPatternDestroy(fc_pattern2);
	}
	// s doesn't need to be freed according to fontconfig docs
	FcPatternGetString(fc_pattern, FC_FILE, 0, &s);
	vo_font=read_font_desc_ft(s, width, height);
	FcPatternDestroy(fc_pattern);
    }
    else
#endif
    vo_font=read_font_desc_ft(font_name, width, height);
}

23338:2a66d95355f0

int kerning(font_desc_t *desc, int prevc, int c)
{
    FT_Vector kern;
    
    if (!desc->dynamic) return 0;
    if (prevc < 0 || c < 0) return 0;
    if (desc->font[prevc] != desc->font[c]) return 0;
    if (desc->font[prevc] == -1 || desc->font[c] == -1) return 0;
    FT_Get_Kerning(desc->faces[desc->font[c]], 
		   desc->glyph_index[prevc], desc->glyph_index[c],

    }

    return 0;
}

void load_font_ft(int width, int height, font_desc_t** fontp, const char *font_name) 
{
#ifdef HAVE_FONTCONFIG
    FcPattern *fc_pattern;
    FcPattern *fc_pattern2;
    FcChar8 *s;
    FcBool scalable;
#endif
    font_desc_t *vo_font = *fontp;
    vo_image_width = width;
    vo_image_height = height;

    // protection against vo_aa font hacks
    if (vo_font && !vo_font->dynamic) return;

    	    fc_pattern = FcFontMatch(0, fc_pattern, 0);
	    FcPatternDestroy(fc_pattern2);
	}
	// s doesn't need to be freed according to fontconfig docs
	FcPatternGetString(fc_pattern, FC_FILE, 0, &s);
	*fontp=read_font_desc_ft(s, width, height);
	FcPatternDestroy(fc_pattern);
    }
    else
#endif
    *fontp=read_font_desc_ft(font_name, width, height);
}