xorg/xc/lib/Xft
Saren Sandmann Pedersen
sandmann at daimi.au.dk
Fri Aug 13 21:24:08 EEST 2004
CVS commit by sandmann:
Fri Aug 13 19:53:10 2004 Soeren Sandmann <sandmann at redhat.com>
* programs/Xserver/hw/xfree86/drivers/mga/mga_storm.c
(MGAStormSync): Fix for lockups on some versions of Matrox
Mystique. #687, Patch from Mike Harris.
* programs/Xserver/hw/xfree86/common/xf86RandR.c
(xf86RandRSetMode): Call xf86EnableDisableFBAccess though the
function pointer instead of directly. #1041, Patch from Aaron Plattner.
* programs/Xserver/hw/xfree86/common/xf86RandR.c: Swap the
phsyical size of the screen when rotiation. #1050, Patch from
Aaron Plattner.
Fri Aug 13 19:47:12 2004 Soeren Sandmann <sandmann at redhat.com>
* xftint.h: 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.
M +6 -0 xorg/xc/lib/Xft/ChangeLog 1.3
M +9 -0 xorg/xc/lib/Xft/xftint.h 1.3
--- xorg/xc/lib/Xft/ChangeLog #1.2:1.3
@@ -1,2 +1,8 @@
+Fri Aug 13 19:47:12 2004 Soeren Sandmann <sandmann at redhat.com>
+
+ * xftint.h: 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.
+
2004-03-22 Keith Packard <keithp at keithp.com>
--- xorg/xc/lib/Xft/xftint.h #1.2:1.3
@@ -44,4 +44,13 @@
#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;
More information about the xorg-commit
mailing list