diff options
| author | Ulrich Sibiller <uli42@gmx.de> | 2017-11-05 21:41:08 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2018-02-05 13:57:14 +0100 |
| commit | f7207bcdc1b1f5d4b52cd3dccdde3762245ee42b (patch) | |
| tree | de58da88f279d227b726a40513fd85148fd94c6b /nx-X11/programs/Xserver/fb/fbgc.c | |
| parent | b1c42dc98bea8b99eb8a2b1618421bdb698cf690 (diff) | |
| download | nx-libs-f7207bcdc1b1f5d4b52cd3dccdde3762245ee42b.tar.gz nx-libs-f7207bcdc1b1f5d4b52cd3dccdde3762245ee42b.tar.bz2 nx-libs-f7207bcdc1b1f5d4b52cd3dccdde3762245ee42b.zip | |
Lift fb to xorg-xserver-7.1/1.1 state
Fixes ArcticaProject/nx-libs#640
Diffstat (limited to 'nx-X11/programs/Xserver/fb/fbgc.c')
| -rw-r--r-- | nx-X11/programs/Xserver/fb/fbgc.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/nx-X11/programs/Xserver/fb/fbgc.c b/nx-X11/programs/Xserver/fb/fbgc.c index 437bc5df3..44eecfbe2 100644 --- a/nx-X11/programs/Xserver/fb/fbgc.c +++ b/nx-X11/programs/Xserver/fb/fbgc.c @@ -98,9 +98,13 @@ fbPadPixmap (PixmapPtr pPixmap) FbBits mask; int height; int w; + int stride; + int bpp; + _X_UNUSED int xOff, yOff; + + fbGetDrawable (&pPixmap->drawable, bits, stride, bpp, xOff, yOff); width = pPixmap->drawable.width * pPixmap->drawable.bitsPerPixel; - bits = pPixmap->devPrivate.ptr; height = pPixmap->drawable.height; mask = FbBitsMask (0, width); while (height--) @@ -112,7 +116,8 @@ fbPadPixmap (PixmapPtr pPixmap) b = b | FbScrRight(b, w); w <<= 1; } - *bits++ = b; + *bits = b; + bits += stride; } } |