diff options
author | marha <marha@users.sourceforge.net> | 2009-07-25 20:12:58 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2009-07-25 20:12:58 +0000 |
commit | 2553bdd7c359cd87525d367761c86932cec5adff (patch) | |
tree | ae71245933c98474a699d3e392de5820879b2018 /xorg-server/include/pixmapstr.h | |
parent | e2c51f2ee7b0a3ea1a052fc49324057b4a4bbc78 (diff) | |
parent | 4a3dbb926ae3f5410198d7cc4f4ebe4f62eebf05 (diff) | |
download | vcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.tar.gz vcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.tar.bz2 vcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.zip |
svn merge file:///D:/svnrepos/vcxsrv/branches/released .
Diffstat (limited to 'xorg-server/include/pixmapstr.h')
-rw-r--r-- | xorg-server/include/pixmapstr.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xorg-server/include/pixmapstr.h b/xorg-server/include/pixmapstr.h index 4150b69b7..8002b170a 100644 --- a/xorg-server/include/pixmapstr.h +++ b/xorg-server/include/pixmapstr.h @@ -74,8 +74,8 @@ typedef struct _Pixmap { DrawableRec drawable; PrivateRec *devPrivates; int refcnt; - int devKind; - DevUnion devPrivate; + int devKind; /* This is the pitch of the pixmap, typically width*bpp/8. */ + DevUnion devPrivate; /* When !NULL, devPrivate.ptr points to the raw pixel data. */ short screen_x; short screen_y; unsigned usage_hint; /* see CREATE_PIXMAP_USAGE_* */ |