summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJamey Sharp <jamey@minilop.net>2010-05-06 11:00:39 -0700
committerKeith Packard <keithp@keithp.com>2010-05-07 21:58:02 -0700
commit580b99bb8af4ea093953c2b885bd4272aaf02baf (patch)
treea2e62c03bd1cf3e31466ce704550a6e85c5e2ea1
parentc677fc611b124c44adfcfb95718798105f26357b (diff)
Return BadPicture, not BadPixmap, if alpha-map is invalid.
I believe this is what was intended. Signed-off-by: Jamey Sharp <jamey@minilop.net> Reviewed-by: Adam Jackson <ajax@redhat.com> Signed-off-by: Keith Packard <keithp@keithp.com>
-rw-r--r--render/picture.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/render/picture.c b/render/picture.c
index 18bfea29b..48693b8ef 100644
--- a/render/picture.c
+++ b/render/picture.c
@@ -1115,7 +1115,7 @@ ChangePicture (PicturePtr pPicture,
if (error != Success)
{
client->errorValue = pid;
- error = (error == BadValue) ? BadPixmap : error;
+ error = (error == BadValue) ? RenderErrBase + BadPicture : error;
break;
}
if (pAlpha->pDrawable == NULL ||