← Back to branch summary

~ubuntu-branches/ubuntu/feisty/xorg-server/feisty

« back to all changes in this revision

Viewing changes to mi/mipushpxl.c

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien Bacher, Timo Aaltonen
  • Date: 2007-02-26 09:36:38 UTC
  • mfrom: (1.1.5 upstream)
  • Revision ID: james.westby@ubuntu.com-20070226093638-z7nq1i01gcuujj06
Tags: 2:1.2.0-3ubuntu1
* Don't drop 42_build_int10_submodules.diff, it's useful
* 019_ubuntu_enable_composite.diff:
  - enable composite
* debian/control:
  - fixed Maintainer email
* debian/xserver-xorg-core.install:
  - list ioport, gtf, pcitweak and scanpci 
    and manpages for scanpci, gtf, pcitweak

[ Timo Aaltonen ]
* Merge with Debian, remaining changes:
  - debian/rules:
    + build using -fno-stack-protector
    + --with-os-vendor=Ubuntu
  - debian/control:
    + don't Conflict with xserver-xorg-video
  - refreshed and renamed patches
    102_ubuntu_sharevts_load_cpu.patch
    104_fedora_init_origins_fix.patch
    106_ubuntu_fpic_libxf86config.patch
    114_fedora_no_composite_in_xnest.patch
    121_only_switch_vt_when_active.diff
    124_fix-pdripriv_null_deref.patch
  - dropped for now:
    42_build_int10_submodules.diff - causes "some regression"
* dropped patches (comments from Michel Daenzer):
  - 107_fedora_dont_backfill_bg_none.patch
    "Breaks X semantics and thus can't go in upstream. Apps/toolkits
     need to be fixed not to use background none windows."
  - 108_fedora_gl_include_inferiors.patch
    "Breaks GLX semantics and should no longer be necessary now that
     the GLX compositing managers default to using the Composite
     Overlay Window."
  - 120_fedora_disable_offscreen_pixmaps.diff
    "Last time I looked at this, it was a gross hack to work around XAA
     deficiencies in offscreen pixmap handling, which makes the server
     die immediately when trying to use GLX_EXT_texture_from_pixmap
     with EXA, due to calling XAA functions without checking it's
     active or even loaded."
* debian/control:
  - set Conflicts: xkb-data (<< 0.9), since xkb-path is
    different from previous releases
* debian/patches/125_randr-version-supported.diff:
  - The server supports protocol 1.1, make sure we use it.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mi/mipushpxl.c
1
 
/* $XFree86: xc/programs/Xserver/mi/mipushpxl.c,v 3.12 2001/12/14 20:00:26 dawes Exp $ */
2
1
/***********************************************************
3
2
 
4
3
Copyright 1987, 1998  The Open Group
45
44
SOFTWARE.
46
45
 
47
46
******************************************************************/
48
 
/* $Xorg: mipushpxl.c,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */
49
47
#ifdef HAVE_DIX_CONFIG_H
50
48
#include <dix-config.h>
51
49
#endif
95
93
    Bool        fInBox;
96
94
    DDXPointRec pt[NPT], ptThisLine;
97
95
    int         width[NPT];
98
 
#ifdef XFree86Server
 
96
#if 1
99
97
    PixelType   startmask;
100
98
    if (screenInfo.bitmapBitOrder == IMAGE_BYTE_ORDER)
101
99
      if (screenInfo.bitmapBitOrder == LSBFirst)
135
133
        while(pw  < pwEnd)
136
134
        {
137
135
            w = *pw;
138
 
#ifdef XFree86Server
 
136
#if 1
139
137
            msk = startmask;
140
138
#else
141
139
            msk = (MiBits)(-1) ^ SCRRIGHT((MiBits)(-1), 1);
168
166
                        fInBox = FALSE;
169
167
                    }
170
168
                }
171
 
#ifdef XFree86Server
 
169
#if 1
172
170
                /* This is not quite right, but it'll do for now */
173
171
                if (screenInfo.bitmapBitOrder == IMAGE_BYTE_ORDER)
174
172
                  if (screenInfo.bitmapBitOrder == LSBFirst)
191
189
        {
192
190
            /* Process final partial word on line */
193
191
            w = *pw;
194
 
#ifdef XFree86Server
 
192
#if 1
195
193
            msk = startmask;
196
194
#else
197
195
            msk = (MiBits)(-1) ^ SCRRIGHT((MiBits)(-1), 1);
224
222
                        fInBox = FALSE;
225
223
                    }
226
224
                }
227
 
#ifdef XFree86Server
 
225
#if 1
228
226
                /* This is not quite right, but it'll do for now */
229
227
                if (screenInfo.bitmapBitOrder == IMAGE_BYTE_ORDER)
230
228
                  if (screenInfo.bitmapBitOrder == LSBFirst)