diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2011-02-02 20:47:09 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2011-02-02 20:47:09 +0000 |
| commit | 89d16619a9f1d54fc8e0e3c421976000fe127d74 (patch) | |
| tree | a0d2c107fadee528b161eff962d0485c18028f5e /xserver/exa | |
| parent | 55ce9abe5a78acfe9dc946f585aef9ab86be510c (diff) | |
Merge another EXA fix from X.Org 1.9.4RC1:
EXA: Pad size of system memory copy for 1x1 pixmaps (bug #32803).
Diffstat (limited to 'xserver/exa')
| -rw-r--r-- | xserver/exa/exa_mixed.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xserver/exa/exa_mixed.c b/xserver/exa/exa_mixed.c index ef20eb502..606f1e1f9 100644 --- a/xserver/exa/exa_mixed.c +++ b/xserver/exa/exa_mixed.c @@ -98,7 +98,7 @@ exaCreatePixmap_mixed(ScreenPtr pScreen, int w, int h, int depth, pExaPixmap->use_gpu_copy = FALSE; if (w == 1 && h == 1) { - pExaPixmap->sys_ptr = malloc((pPixmap->drawable.bitsPerPixel + 7) / 8); + pExaPixmap->sys_ptr = malloc(paddedWidth); /* Set up damage tracking */ pExaPixmap->pDamage = DamageCreate(exaDamageReport_mixed, NULL, |