comparison libvo/font_load_ft.c @ 21501:aecea8c8afee

Properly free fontconfig patterns

21500:e7e7f397f991

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

	    font_name = strdup("sans-serif");
	FcInit();
	fc_pattern = FcNameParse(font_name);
	FcConfigSubstitute(0, fc_pattern, FcMatchPattern);
	FcDefaultSubstitute(fc_pattern);
	fc_pattern = FcFontMatch(0, fc_pattern, 0);
	FcPatternGetBool(fc_pattern, FC_SCALABLE, 0, &scalable);
	if (scalable != FcTrue) {
    	    fc_pattern = FcNameParse("sans-serif");
    	    FcConfigSubstitute(0, fc_pattern, FcMatchPattern);
    	    FcDefaultSubstitute(fc_pattern);
    	    fc_pattern = FcFontMatch(0, fc_pattern, 0);
	}
	// 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);
	free(fc_pattern);
    }
    else
#endif
    vo_font=read_font_desc_ft(font_name, width, height);
}

21501:aecea8c8afee

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;

	    font_name = strdup("sans-serif");
	FcInit();
	fc_pattern = FcNameParse(font_name);
	FcConfigSubstitute(0, fc_pattern, FcMatchPattern);
	FcDefaultSubstitute(fc_pattern);
	fc_pattern2 = fc_pattern;
	fc_pattern = FcFontMatch(0, fc_pattern, 0);
	FcPatternDestroy(fc_pattern2);
	FcPatternGetBool(fc_pattern, FC_SCALABLE, 0, &scalable);
	if (scalable != FcTrue) {
	    FcPatternDestroy(fc_pattern);
    	    fc_pattern = FcNameParse("sans-serif");
    	    FcConfigSubstitute(0, fc_pattern, FcMatchPattern);
    	    FcDefaultSubstitute(fc_pattern);
	    fc_pattern2 = fc_pattern;
    	    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);
}