← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/xorg-server/oneiric-proposed

« back to all changes in this revision

Viewing changes to debian/patches/218_randr-check-rotated-virtual-size-limits-correctly.diff

  • Committer: Bazaar Package Importer
  • Author(s): Timo Aaltonen
  • Date: 2011-07-05 16:22:23 UTC
  • mfrom: (1.1.44 upstream) (0.11.25 sid)
  • Revision ID: james.westby@ubuntu.com-20110705162223-r7wfqdkwl8zubdjb
Tags: 2:1.10.2.902-1ubuntu1
https://launchpad.net/bugs/441653
https://launchpad.net/bugs/389519
* Merge from Debian unstable. (LP: #441653)
  - Update 500_xi2.1.patch to apply.
  - Drop patch 218_randr-check-rotated-virtual-size-limits-correctly.diff,
    fixed upstream.
* Update the crtc confinement patch with one that should work, with
  further fixes from upstream. (LP: #389519)
* Dropped a bunch of old Breaks from xserver-xorg-core.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/218_randr-check-rotated-virtual-size-limits-correctly.diff
1
 
diff --git a/randr/rrscreen.c b/randr/rrscreen.c
2
 
index 1bc1a9e..da6d48d 100644
3
 
--- a/randr/rrscreen.c
4
 
+++ b/randr/rrscreen.c
5
 
@@ -910,12 +910,6 @@ ProcRRSetScreenConfig (ClientPtr client)
6
 
      */
7
 
     width = mode->mode.width;
8
 
     height = mode->mode.height;
9
 
-    if (rotation & (RR_Rotate_90|RR_Rotate_270))
10
 
-    {
11
 
-       width = mode->mode.height;
12
 
-       height = mode->mode.width;
13
 
-    }
14
 
-
15
 
     if (width < pScrPriv->minWidth || pScrPriv->maxWidth < width) {
16
 
        client->errorValue = width;
17
 
        free(pData);
18
 
@@ -927,6 +921,12 @@ ProcRRSetScreenConfig (ClientPtr client)
19
 
        return BadValue;
20
 
     }
21
 
 
22
 
+    if (rotation & (RR_Rotate_90|RR_Rotate_270))
23
 
+    {
24
 
+       width = mode->mode.height;
25
 
+       height = mode->mode.width;
26
 
+    }
27
 
+
28
 
     if (width != pScreen->width || height != pScreen->height)
29
 
     {
30
 
        int     c;