diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2019-06-22 11:32:42 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2019-06-22 11:32:42 +0200 |
| commit | abf3741362f4c200945db6403fcd54df6754d4af (patch) | |
| tree | ea7d12c03048fab6e0cbc7571b779c592d610512 /nx-X11/programs/Xserver/hw/nxagent/NXshm.c | |
| parent | c0754a35755cdd4e25386abc6378e07605845948 (diff) | |
| parent | c8a5e33fcdde322f486d6c69e7e16fa346793fc9 (diff) | |
| download | nx-libs-abf3741362f4c200945db6403fcd54df6754d4af.tar.gz nx-libs-abf3741362f4c200945db6403fcd54df6754d4af.tar.bz2 nx-libs-abf3741362f4c200945db6403fcd54df6754d4af.zip | |
Merge branch 'uli42-pr/various' into 3.6.x
Attributes GH PR #815: https://github.com/ArcticaProject/nx-libs/pull/815
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/NXshm.c')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/NXshm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXshm.c b/nx-X11/programs/Xserver/hw/nxagent/NXshm.c index 246d39355..9a314391c 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXshm.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXshm.c @@ -387,8 +387,8 @@ ProcShmPutImage(client) ((stuff->format != ZPixmap) && (stuff->srcX < screenInfo.bitmapScanlinePad) && ((stuff->format == XYBitmap) || - - ((stuff->srcY == 0) && - - (stuff->srcHeight == stuff->totalHeight))))) && + ((stuff->srcY == 0) && + (stuff->srcHeight == stuff->totalHeight))))) && ((stuff->srcX + stuff->srcWidth) == stuff->totalWidth)) (*pGC->ops->PutImage) (pDraw, pGC, stuff->depth, stuff->dstX, stuff->dstY, @@ -396,7 +396,7 @@ ProcShmPutImage(client) stuff->srcX, stuff->format, shmdesc->addr + stuff->offset + (stuff->srcY * length)); -- else + else #endif { #ifdef TEST |