From 580b99bb8af4ea093953c2b885bd4272aaf02baf Mon Sep 17 00:00:00 2001
From: Jamey Sharp <jamey@minilop.net>
Date: Thu, 6 May 2010 11:00:39 -0700
Subject: [PATCH] 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>
---
 render/picture.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 ||