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 a9d78e0165a5d6fbd5c70d1009007ffbe61cf024
Author: Mihai Moldovan <io...@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 110f65e..e4f22ce 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
_______________________________________________
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits
