fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2026-05-05 19:18:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make dependence on FC_HINT_STYLE conditional. (reported by Abraham Egnor)

Browse source 
Use FT_LOAD_MONOCHROME if FT_LOAD_TARGET_MONO isn't defined for compatibility with older FreeType.
This commit is contained in:
Owen Taylor 2005-01-21 15:31:15 +00:00
parent 97424a3c2a
commit e613961f94
3 changed files with 33 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
2005-01-21 Owen Taylor <otaylor@redhat.com>
* src/cairo_ft_font.c (_get_load_flags): Make dependence
on FC_HINT_STYLE conditional. (reported by Abraham Egnor)
* src/cairo_ft_font.c: Use FT_LOAD_MONOCHROME if
FT_LOAD_TARGET_MONO isn't defined for compatibility
with older FreeType.
2005-01-16 Owen Taylor <otaylor@redhat.com>
Change cairo_font_t to refer to a font scaled to a particular

12
src/cairo-ft-font.c
View file

@ -479,6 +479,11 @@ typedef struct {
ft_unscaled_font_t *unscaled;
} cairo_ft_font_t;
/* for compatibility with older freetype versions */
#ifndef FT_LOAD_TARGET_MONO
#define FT_LOAD_TARGET_MONO FT_LOAD_MONOCHROME
#endif
/* The load flags passed to FT_Load_Glyph control aspects like hinting and
* antialiasing. Here we compute them from the fields of a FcPattern.
*/
@ -486,7 +491,9 @@ static int
_get_load_flags (FcPattern *pattern)
{
FcBool antialias, hinting, autohint;
#ifdef FC_HINT_STYLE
int hintstyle;
#endif
int load_flags = 0;
/* disable antialiasing if requested */
@ -504,11 +511,16 @@ _get_load_flags (FcPattern *pattern)
FC_HINTING, 0, &hinting) != FcResultMatch)
hinting = FcTrue;
#ifdef FC_HINT_STYLE
if (FcPatternGetInteger (pattern, FC_HINT_STYLE, 0, &hintstyle) != FcResultMatch)
hintstyle = FC_HINT_FULL;
if (!hinting || hintstyle == FC_HINT_NONE)
load_flags |= FT_LOAD_NO_HINTING;
#else /* !FC_HINT_STYLE */
if (!hinting)
load_flags |= FT_LOAD_NO_HINTING;
#endif /* FC_FHINT_STYLE */
switch (hintstyle) {
case FC_HINT_SLIGHT:

12
src/cairo_ft_font.c
View file

@ -479,6 +479,11 @@ typedef struct {
ft_unscaled_font_t *unscaled;
} cairo_ft_font_t;
/* for compatibility with older freetype versions */
#ifndef FT_LOAD_TARGET_MONO
#define FT_LOAD_TARGET_MONO FT_LOAD_MONOCHROME
#endif
/* The load flags passed to FT_Load_Glyph control aspects like hinting and
* antialiasing. Here we compute them from the fields of a FcPattern.
*/
@ -486,7 +491,9 @@ static int
_get_load_flags (FcPattern *pattern)
{
FcBool antialias, hinting, autohint;
#ifdef FC_HINT_STYLE
int hintstyle;
#endif
int load_flags = 0;
/* disable antialiasing if requested */
@ -504,11 +511,16 @@ _get_load_flags (FcPattern *pattern)
FC_HINTING, 0, &hinting) != FcResultMatch)
hinting = FcTrue;
#ifdef FC_HINT_STYLE
if (FcPatternGetInteger (pattern, FC_HINT_STYLE, 0, &hintstyle) != FcResultMatch)
hintstyle = FC_HINT_FULL;
if (!hinting || hintstyle == FC_HINT_NONE)
load_flags |= FT_LOAD_NO_HINTING;
#else /* !FC_HINT_STYLE */
if (!hinting)
load_flags |= FT_LOAD_NO_HINTING;
#endif /* FC_FHINT_STYLE */
switch (hintstyle) {
case FC_HINT_SLIGHT: