[X2Go-Commits] [nx-libs] 70/219: NXshm.c: remove left-overs from patch

git-admin at x2go.org git-admin at x2go.org
Sat Sep 28 12:10:23 CEST 2019


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch 3.6.x
in repository nx-libs.

commit 3900ba3f8459c4822eaa6b8ac6035980a63fdfff
Author: Ulrich Sibiller <uli42 at gmx.de>
Date:   Wed May 1 10:40:47 2019 +0200

    NXshm.c: remove left-overs from patch
    
    format was broken, would not compile
---
 nx-X11/programs/Xserver/hw/nxagent/NXshm.c | 6 +++---
 1 file 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

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git


More information about the x2go-commits mailing list