diff options
author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-01-15 16:27:32 +0100 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-01-15 16:27:32 +0100 |
commit | faae65fb3693fd1020e740e00f9038607bc4a430 (patch) | |
tree | 8ee59a2342f6320f9e8dc3e714b118e106f8d64d /nx-X11/programs/Xserver/hw/nxagent/NXrender.c | |
parent | d545afdf3967b0305c1215bb9f8a545b81fc24e8 (diff) | |
parent | b44ecc0f897a5d03445aafc120e54b6475699254 (diff) | |
download | nx-libs-faae65fb3693fd1020e740e00f9038607bc4a430.tar.gz nx-libs-faae65fb3693fd1020e740e00f9038607bc4a430.tar.bz2 nx-libs-faae65fb3693fd1020e740e00f9038607bc4a430.zip |
Merge branch 'uli42-pr/rework_booleans_v2' into 3.6.x
Attributes GH PR #980: https://github.com/ArcticaProject/nx-libs/pull/980
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/NXrender.c')
-rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/NXrender.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXrender.c b/nx-X11/programs/Xserver/hw/nxagent/NXrender.c index bcb64edcd..5851eb05c 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXrender.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXrender.c @@ -551,8 +551,8 @@ int nxagentCompositePredicate(PicturePtr pSrc, PicturePtr pDst) fprintf(stderr, "nxagentCompositePredicate: Case 1.\n"); #endif - if (nxagentPixmapIsVirtual(pPixmap1) == 1 && - nxagentPixmapIsVirtual(pPixmap2) == 1) + if (nxagentPixmapIsVirtual(pPixmap1) && + nxagentPixmapIsVirtual(pPixmap2)) { #ifdef TEST fprintf(stderr, "nxagentCompositePredicate: Case 2.\n"); |