comparison src/ftfont.c @ 95433:3ffecc48d809

(ftfont_font_format): Don't use strcasestr.

95432:e18e11dca65b

Lisp_Object
ftfont_font_format (FcPattern *pattern)
{
  FcChar8 *str;

#ifdef FC_FONTFORMAT
  if (FcPatternGetString (pattern, FC_FONTFORMAT, 0, &str) != FcResultMatch)
    return Qnil;
  if (strcmp ((char *) str, "TrueType") == 0)

  if (strcmp ((char *) str, "BDF") == 0)  
    return intern ("bdf");
#else  /* not FC_FONTFORMAT */
  if (FcPatternGetString (pattern, FC_FILE, 0, &str) != FcResultMatch)
    return Qnil;
  if (strcasestr ((char *) str, ".ttf") == 0)
    return intern ("truetype");
  if (strcasestr ((char *) str, "pfb") == 0)
    return intern ("type1");
  if (strcasestr ((char *) str, "pcf") == 0)  
    return intern ("pcf");
  if (strcasestr ((char *) str, "bdf") == 0)  
    return intern ("bdf");
#endif	/* not FC_FONTFORMAT */
  return intern ("unknown");
}



95433:3ffecc48d809

Lisp_Object
ftfont_font_format (FcPattern *pattern)
{
  FcChar8 *str;
  int len;

#ifdef FC_FONTFORMAT
  if (FcPatternGetString (pattern, FC_FONTFORMAT, 0, &str) != FcResultMatch)
    return Qnil;
  if (strcmp ((char *) str, "TrueType") == 0)

  if (strcmp ((char *) str, "BDF") == 0)  
    return intern ("bdf");
#else  /* not FC_FONTFORMAT */
  if (FcPatternGetString (pattern, FC_FILE, 0, &str) != FcResultMatch)
    return Qnil;
  len = strlen ((char *) str);
  if (len >= 4)
    {
      str += len - 4;
      if (xstrcasecmp ((char *) str, ".ttf") == 0)
	return intern ("truetype");
      if (xstrcasecmp ((char *) str, "pfb") == 0)
	return intern ("type1");
      if (xstrcasecmp ((char *) str, "pcf") == 0)  
	return intern ("pcf");
      if (xstrcasecmp ((char *) str, "bdf") == 0)  
	return intern ("bdf");
    }
#endif	/* not FC_FONTFORMAT */
  return intern ("unknown");
}