This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch 3.6.x-rpm-debug in repository nx-libs. from 9a71aa0 Merge branch 'bugfix/xinerama-crtcs' into 3.6.x-rpm-debug new 2e421f4 nx-X11/programs/Xserver/hw/nxagent/Screen.c: fix intersection break-out. new e6f1aef nx-X11/programs/Xserver/hw/nxagent/Screen.c: add more debugging to intersect(), TO BE REMOVED later. new a33418d Merge branch 'bugfix/xinerama-crtcs' into 3.6.x-rpm-debug The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: nx-X11/programs/Xserver/hw/nxagent/Screen.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch 3.6.x-rpm-debug in repository nx-libs. commit 2e421f4c19f66b606773bde07e35a3fe33676378 Author: Mihai Moldovan <ionic@ionic.de> Date: Tue May 1 23:46:02 2018 +0200 nx-X11/programs/Xserver/hw/nxagent/Screen.c: fix intersection break-out. --- nx-X11/programs/Xserver/hw/nxagent/Screen.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.c b/nx-X11/programs/Xserver/hw/nxagent/Screen.c index c1ab13f..bdba4fa 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c @@ -3646,8 +3646,7 @@ static Bool intersect(int ax1, int ay1, unsigned int aw, unsigned int ah, /* thanks to http://silentmatt.com/rectangle-intersection */ /* check if there's any intersection at all */ - if (ax2 < bx1 || bx2 < ax1 || ay2 < by1 || by2 < ay1) { - + if ((ax1 >= bx2) || (ax2 <= bx1) || (ay1 >= by2) || (ay2 <= by1)) { #ifdef DEBUG fprintf(stderr, "intersect: the given rectangles do not intersect at all\n"); #endif -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch 3.6.x-rpm-debug in repository nx-libs. commit e6f1aef5141623d4da6c3310f7a4f6a20546443c Author: Mihai Moldovan <ionic@ionic.de> Date: Tue May 1 23:46:47 2018 +0200 nx-X11/programs/Xserver/hw/nxagent/Screen.c: add more debugging to intersect(), TO BE REMOVED later. --- nx-X11/programs/Xserver/hw/nxagent/Screen.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.c b/nx-X11/programs/Xserver/hw/nxagent/Screen.c index bdba4fa..7be4517 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c @@ -3635,6 +3635,10 @@ static Bool intersect(int ax1, int ay1, unsigned int aw, unsigned int ah, int bx1, int by1, unsigned int bw, unsigned int bh, int *x, int *y, unsigned int *w, unsigned int *h) { +#ifdef DEBUG + fprintf(stderr, "%s: DEBUG: [(%d, %d) -> (%u, %u)]; [(%d, %d) -> (%u, %u)]; [%p], [%p], [%p], [%p]\n", ax1, ay2, aw, ah, bx1, by1, bw, bh, (void*)(x), (void*)(y), (void*)(w), (void*)(h)); +#endif + int tx1, ty1, tx2, ty2, ix, iy; unsigned int iw, ih; -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch 3.6.x-rpm-debug in repository nx-libs. commit a33418d8a9d76b9df94755ea3ce14c6da30d8d8c Merge: 9a71aa0 e6f1aef Author: Mihai Moldovan <ionic@ionic.de> Date: Tue May 1 23:47:56 2018 +0200 Merge branch 'bugfix/xinerama-crtcs' into 3.6.x-rpm-debug nx-X11/programs/Xserver/hw/nxagent/Screen.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
-
git-admin＠x2go.org