diff options
| author | Søren Sandmann Pedersen <sandmann@daimi.au.dk> | 2004-08-13 18:24:06 +0000 |
|---|---|---|
| committer | Søren Sandmann Pedersen <sandmann@daimi.au.dk> | 2004-08-13 18:24:06 +0000 |
| commit | 0641e99b21eead5aaee0c1136dd2d640028f6783 (patch) | |
| tree | d5b095543167a19a1b80ad1c55de26ce015e43a2 | |
| parent | 14c188e8b0a0d88f97bcde21c8e1b1da8541bdf8 (diff) | |
| download | xorg-lib-libXft-0641e99b21eead5aaee0c1136dd2d640028f6783.tar.gz | |
Fri Aug 13 19:53:10 2004 Soeren Sandmann <sandmann@redhat.com>
Fix for lockups on some versions of Matrox Mystique. #687, Patch from Mike
Harris.
Call xf86EnableDisableFBAccess though the function pointer instead of
directly. #1041, Patch from Aaron Plattner.
Swap the phsyical size of the screen when rotiation. #1050, Patch from
Aaron Plattner.
Fri Aug 13 19:47:12 2004 Soeren Sandmann <sandmann@redhat.com>
Make HAVE_FT_BITMAP_SIZE_Y_PPEM conditional on the FreeType version instead
of proping it. This way it will work with the monolithic version too.
#1062, Patch by Owen Taylor.
| -rw-r--r-- | src/xftint.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/xftint.h b/src/xftint.h index bf5e07c..36de634 100644 --- a/src/xftint.h +++ b/src/xftint.h @@ -43,6 +43,15 @@ #include <fontconfig/fcprivate.h> #include <fontconfig/fcfreetype.h> +#ifndef HAVE_CONFIG_H +# if (FREETYPE_MAJOR > 2 || \ + (FREETYPE_MAJOR == 2 && (FREETYPE_MINOR > 1 || \ + (FREETYPE_MINOR == 1 && FREETYPE_PATCH >= 5)))) +# define HAVE_FT_BITMAP_SIZE_Y_PPEM 1 +# else +# define HAVE_FT_BITMAP_SIZE_Y_PPEM 0 +#endif + typedef struct _XftMatcher { char *object; double (*compare) (char *object, FcValue value1, FcValue value2); |