diff options
| author | marha <marha@users.sourceforge.net> | 2010-05-20 15:26:41 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-05-20 15:26:41 +0000 |
| commit | f5fb2d27f1fd4976f0e77d97461a5e57ba6c9a23 (patch) | |
| tree | c76e9cb708483e65b114c08ed008880f478cae15 /xorg-server/render/picture.c | |
| parent | b16c0295c9f95426980d567e93ae00c52545b3fa (diff) | |
| parent | 3319741e6f9fc3232eb40462a261271b9af2dcb2 (diff) | |
| download | vcxsrv-f5fb2d27f1fd4976f0e77d97461a5e57ba6c9a23.tar.gz vcxsrv-f5fb2d27f1fd4976f0e77d97461a5e57ba6c9a23.tar.bz2 vcxsrv-f5fb2d27f1fd4976f0e77d97461a5e57ba6c9a23.zip | |
svn merge "^/branches/released" .
Diffstat (limited to 'xorg-server/render/picture.c')
| -rw-r--r-- | xorg-server/render/picture.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/xorg-server/render/picture.c b/xorg-server/render/picture.c index 12d1cee93..a67a95888 100644 --- a/xorg-server/render/picture.c +++ b/xorg-server/render/picture.c @@ -1115,7 +1115,6 @@ ChangePicture (PicturePtr pPicture, if (error != Success)
{
client->errorValue = pid;
- error = (error == BadValue) ? RenderErrBase + BadPicture : error;
break;
}
if (pAlpha->pDrawable == NULL ||
@@ -1176,7 +1175,6 @@ ChangePicture (PicturePtr pPicture, if (error != Success)
{
client->errorValue = pid;
- error = (error == BadValue) ? BadPixmap : error;
break;
}
}
|