← Back to branch summary

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

« back to all changes in this revision

Viewing changes to fb/fbline.c

  • Committer: Package Import Robot
  • Author(s): Christopher James Halse Rogers
  • Date: 2012-01-23 16:09:29 UTC
  • mfrom: (1.1.46) (0.11.34 sid)
  • Revision ID: package-import@ubuntu.com-20120123160929-k4xdb9b7xeesiukp
Tags: 2:1.11.3-0ubuntu8
https://launchpad.net/bugs/903973
* debian/patches/224_return_BadWindow_not_BadMatch.diff:
  - Fix the error values of a whole slew of window-related calls.
    Fixes some gnome-settings-daemon aborts in XLib (LP: #903973)

Show diffs side-by-side

added added

removed removed

Lines of Context:
fb/fbline.c
114
114
    if (pGC->lineWidth == 0)
115
115
    {
116
116
        line = fbZeroLine;
117
 
#ifndef FBNOPIXADDR
118
117
        if (pGC->fillStyle == FillSolid &&
119
118
            pGC->lineStyle == LineSolid &&
120
119
            RegionNumRects (fbGetCompositeClip(pGC)) == 1)
122
121
            switch (pDrawable->bitsPerPixel) {
123
122
            case 8:  line = fbPolyline8; break;
124
123
            case 16: line = fbPolyline16; break;
125
 
#ifdef FB_24BIT
126
124
            case 24: line = fbPolyline24; break;
127
 
#endif
128
125
            case 32: line = fbPolyline32; break;
129
126
            }
130
127
        }
131
 
#endif
132
128
    }
133
129
    else
134
130
    {
151
147
    if (pGC->lineWidth == 0)
152
148
    {
153
149
        seg = fbZeroSegment;
154
 
#ifndef FBNOPIXADDR
155
150
        if (pGC->fillStyle == FillSolid &&
156
151
            pGC->lineStyle == LineSolid &&
157
152
            RegionNumRects (fbGetCompositeClip(pGC)) == 1)
159
154
            switch (pDrawable->bitsPerPixel) {
160
155
            case 8:  seg = fbPolySegment8; break;
161
156
            case 16: seg = fbPolySegment16; break;
162
 
#ifdef FB_24BIT
163
157
            case 24: seg = fbPolySegment24; break;
164
 
#endif
165
158
            case 32: seg = fbPolySegment32; break;
166
159
            }
167
160
        }
168
 
#endif
169
161
    }
170
162
    else
171
163
    {