← Back to branch summary

~chasedouglas/ubuntu/maverick/xorg-server/multitouch

« back to all changes in this revision

Viewing changes to render/render.c

  • Committer: Bazaar Package Importer
  • Author(s): Julien Cristau, Julien Cristau, Christopher James Halse Rogers
  • Date: 2010-06-07 23:22:48 UTC
  • mfrom: (0.9.4 upstream)
  • mto: This revision was merged to the branch mainline in revision 187.
  • Revision ID: james.westby@ubuntu.com-20100607232248-x9ob0sjy8bwkc2ki
Tags: 2:1.8.1.901-1
[ Julien Cristau ]
* New upstream release
* Merge changes from 2:1.7.7-2.

[ Christopher James Halse Rogers ]
* 16-xaa-fbcomposite-fix-negative-size.diff:
  - mi hunk merged upstream.  Update to keep just the fbpict.c hunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
render/render.c
1159
1159
                                                   width, height, depth,
1160
1160
                                                   CREATE_PIXMAP_USAGE_GLYPH_PICTURE);
1161
1161
 
 
1162
                if (!pDstPix)
 
1163
                {
 
1164
                    err = BadAlloc;
 
1165
                    goto bail;
 
1166
                }
 
1167
 
1162
1168
                GlyphPicture (glyph)[screen] = pDst =
1163
1169
                        CreatePicture (0, &pDstPix->drawable,
1164
1170
                                       glyphSet->format,
1168
1174
                /* The picture takes a reference to the pixmap, so we
1169
1175
                   drop ours. */
1170
1176
                (pScreen->DestroyPixmap) (pDstPix);
 
1177
                pDstPix = NULL;
1171
1178
 
1172
1179
                if (! pDst)
1173
1180
                {