diff options
| author | marha <marha@users.sourceforge.net> | 2010-07-10 15:30:20 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-07-10 15:30:20 +0000 |
| commit | ec013c535cd7057bfdf7d1933cc7478bdb5dba71 (patch) | |
| tree | 5314d289bf854d1de55269b3ebf0dd1e822e4651 /xorg-server/mi | |
| parent | d8d64f070eb8b9d1364b9791c17aa32a21e8eb31 (diff) | |
| parent | d2698d30377ded3f817f90cf2f17d9d3cda5a855 (diff) | |
| download | vcxsrv-ec013c535cd7057bfdf7d1933cc7478bdb5dba71.tar.gz vcxsrv-ec013c535cd7057bfdf7d1933cc7478bdb5dba71.tar.bz2 vcxsrv-ec013c535cd7057bfdf7d1933cc7478bdb5dba71.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/mi')
| -rw-r--r-- | xorg-server/mi/miscrinit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xorg-server/mi/miscrinit.c b/xorg-server/mi/miscrinit.c index 60a983e65..6ac9090b2 100644 --- a/xorg-server/mi/miscrinit.c +++ b/xorg-server/mi/miscrinit.c @@ -76,7 +76,6 @@ miModifyPixmapHeader(PixmapPtr pPixmap, int width, int height, int depth, pPixmap->drawable.depth = depth;
pPixmap->drawable.bitsPerPixel = bitsPerPixel;
pPixmap->drawable.id = 0;
- pPixmap->drawable.serialNumber = NEXT_SERIAL_NUMBER;
pPixmap->drawable.x = 0;
pPixmap->drawable.y = 0;
pPixmap->drawable.width = width;
@@ -116,6 +115,7 @@ miModifyPixmapHeader(PixmapPtr pPixmap, int width, int height, int depth, if (pPixData)
pPixmap->devPrivate.ptr = pPixData;
}
+ pPixmap->drawable.serialNumber = NEXT_SERIAL_NUMBER;
return TRUE;
}
|