From 0c5e1ab504b4e8c56974a234bd440e9fa2f1f941 Mon Sep 17 00:00:00 2001 From: marha Date: Mon, 12 Oct 2009 19:11:20 +0000 Subject: Updated to: font-util-1.1.1 xorg-server-1.7.0.901 --- xorg-server/render/Makefile.in | 3 ++- xorg-server/render/mipict.c | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'xorg-server/render') diff --git a/xorg-server/render/Makefile.in b/xorg-server/render/Makefile.in index 5e5c2717c..e0ec573c7 100644 --- a/xorg-server/render/Makefile.in +++ b/xorg-server/render/Makefile.in @@ -162,6 +162,7 @@ DEPDIR = @DEPDIR@ DGA_CFLAGS = @DGA_CFLAGS@ DGA_LIBS = @DGA_LIBS@ DIX_CFLAGS = @DIX_CFLAGS@ +DIX_LIB = @DIX_LIB@ DLLTOOL = @DLLTOOL@ DMXEXAMPLES_DEP_CFLAGS = @DMXEXAMPLES_DEP_CFLAGS@ DMXEXAMPLES_DEP_LIBS = @DMXEXAMPLES_DEP_LIBS@ @@ -254,6 +255,7 @@ OBJCFLAGS = @OBJCFLAGS@ OBJCLINK = @OBJCLINK@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OS_LIB = @OS_LIB@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -370,7 +372,6 @@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ -distcleancheck_listfiles = @distcleancheck_listfiles@ docdir = @docdir@ driverdir = @driverdir@ dvidir = @dvidir@ diff --git a/xorg-server/render/mipict.c b/xorg-server/render/mipict.c index 71f3de718..b5dfcb2ba 100644 --- a/xorg-server/render/mipict.c +++ b/xorg-server/render/mipict.c @@ -318,14 +318,14 @@ miClipPictureSrc (RegionPtr pRegion, Bool result; pixman_region_translate ( pPicture->clientClip, - pPicture->clipOrigin.x - dx, - pPicture->clipOrigin.y - dy); + pPicture->clipOrigin.x + dx, + pPicture->clipOrigin.y + dy); result = REGION_INTERSECT (pScreen, pRegion, pRegion, pPicture->clientClip); pixman_region_translate ( pPicture->clientClip, - - (pPicture->clipOrigin.x - dx), - - (pPicture->clipOrigin.y - dy)); + - (pPicture->clipOrigin.x + dx), + - (pPicture->clipOrigin.y + dy)); if (!result) return FALSE; -- cgit v1.2.3