1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-20 00:21:35 +00:00

Fix the "exaGetPixmapFirstPixel called for invalid bpp" problem. This bug

is more visible with XFCE.

PR:		ports/156721
Submitted by:	Alexey Shuvaev <shuvaev@physik.uni-wuerzburg.de>
Obtained from:	xorg-server upstream
With hat:	x11@
This commit is contained in:
Koop Mast 2011-08-07 07:17:59 +00:00
parent 454f7db877
commit 28a3558f38
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=279097
2 changed files with 27 additions and 1 deletions

View File

@ -7,7 +7,7 @@
PORTNAME= xorg-server
PORTVERSION= 1.7.7
PORTREVISION= 1
PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= x11-servers
MASTER_SITES= http://xorg.freedesktop.org/releases/individual/xserver/

View File

@ -0,0 +1,26 @@
diff --git a/exa/exa_accel.c b/exa/exa_accel.c
index 6c677c7..b4c0f83 100644
--- exa/exa_accel.c
+++ exa/exa_accel.c
@@ -1057,6 +1057,8 @@ exaFillRegionSolid (DrawablePtr pDrawable, RegionPtr pRegion, Pixel pixel,
*(CARD16*)pExaPixmap->sys_ptr = pixel;
break;
case 8:
+ case 4:
+ case 1:
*(CARD8*)pExaPixmap->sys_ptr = pixel;
}
diff --git a/exa/exa_unaccel.c b/exa/exa_unaccel.c
index a078cc1..855146b 100644
--- exa/exa_unaccel.c
+++ exa/exa_unaccel.c
@@ -748,6 +757,8 @@ exaGetPixmapFirstPixel (PixmapPtr pPixmap)
return pixel;
}
case 8:
+ case 4:
+ case 1:
{
CARD8 pixel;