summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Hopf <mhopf@suse.de>2008-12-11 18:48:02 +0100
committerMatthias Hopf <mhopf@suse.de>2008-12-12 11:01:59 +0100
commitbe21199f550d9a19c10df16ed23c6f9ed94e55da (patch)
treece3b30d5d80074347816fccf75effa13f080dbf5
parent19a978359d7358501cccb79965b78a3f8ec18743 (diff)
randr: Fix initial panning border copypanning-for-server-1.6
Thanks to Julien Cristau for finding this.
-rw-r--r--hw/xfree86/modes/xf86Crtc.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
index 7ed8266fa..e1697a26f 100644
--- a/hw/xfree86/modes/xf86Crtc.c
+++ b/hw/xfree86/modes/xf86Crtc.c
@@ -1345,7 +1345,10 @@ xf86InitialPanning (ScrnInfoPtr scrn)
&track_width, &track_height, &track_left, &track_top,
&brdr[0], &brdr[1], &brdr[2], &brdr[3])) {
case 12:
- memcpy (output->initialBorder, brdr, 4*sizeof(INT16));
+ output->initialBorder[0] = brdr[0];
+ output->initialBorder[1] = brdr[1];
+ output->initialBorder[2] = brdr[2];
+ output->initialBorder[3] = brdr[3];
/* fall through */
case 8:
output->initialTrackingArea.x1 = track_left;