← Back to branch summary

~ubuntu-branches/ubuntu/edgy/xorg-server/edgy-updates

« back to all changes in this revision

Viewing changes to hw/xfree86/dixmods/extmod/xf86vmode.c

  • Committer: Bazaar Package Importer
  • Author(s): Rodrigo Parra Novo
  • Date: 2006-07-25 20:06:28 UTC
  • mfrom: (1.1.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20060725200628-gjmmd9gxfxdc4ejs
Tags: 1:1.1.1-0ubuntu1
* New Upstream version
* Changed Build-Depends from mesa-swrast-source to mesa-swx11-source,
  following Debian package nomenclature
* Re-did 12_security_policy_in_etc.diff for 1.1.1
* Dropped 15_security_allocate_local.diff (applied upstream)
* Dropped 16_SECURITY_setuid.diff (applied upstream)
* Dropped 000_ubuntu_fix_read_kernel_mapping.patch (applied upstream)
* Dropped 002_ubuntu_fix_for_certain_intel_chipsets.patch (applied upstream)
* Updated versioned Build-Depends on mesa-swx11-source to version
  6.5.0.cvs.20060725-0ubuntu1
* Added arrayobj.c, arrayobj.h, bitset.h & rbadaptors.h to
  GL/symlink-mesa.sh (linked from mesa-swx11-source)
* Added arrayobj.c to default build target on GL/mesa/main

Show diffs side-by-side

added added

removed removed

Lines of Context:
hw/xfree86/dixmods/extmod/xf86vmode.c
29
29
from Kaleb S. KEITHLEY
30
30
 
31
31
*/
32
 
/* $XdotOrg: xserver/xorg/hw/xfree86/dixmods/extmod/xf86vmode.c,v 1.8 2005/07/16 03:49:58 kem Exp $ */
 
32
/* $XdotOrg: xserver/xorg/hw/xfree86/dixmods/extmod/xf86vmode.c,v 1.9 2006/02/10 22:00:24 anholt Exp $ */
33
33
/* $Xorg: xf86vmode.c,v 1.3 2000/08/17 19:47:59 cpqbld Exp $ */
34
34
/* THIS IS NOT AN X CONSORTIUM STANDARD OR AN X PROJECT TEAM SPECIFICATION */
35
35
 
52
52
#include "xf86.h"
53
53
#include "vidmodeproc.h"
54
54
 
55
 
#ifdef EXTMODULE
56
 
#include "xf86_ansic.h"
57
 
#endif
58
 
 
59
55
#define DEFAULT_XF86VIDMODE_VERBOSITY   3
60
56
 
61
57
static int VidModeErrorBase;
1593
1589
            return BadAlloc;
1594
1590
   
1595
1591
        if (!VidModeGetGammaRamp(stuff->screen, stuff->size, 
1596
 
                ramp, ramp + length, ramp + (length * 2)))
 
1592
                ramp, ramp + length, ramp + (length * 2))) {
 
1593
            xfree(ramp);
1597
1594
            return BadValue;
 
1595
        }
1598
1596
    }
1599
1597
 
1600
1598
    rep.type = X_Reply;