aboutsummaryrefslogtreecommitdiff
path: root/doc/nx-X11_vs_XOrg69_patches/pixmap.c.NX.patch
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-02-26 08:14:28 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-02-26 08:14:28 +0100
commitabd6cf1bdd661f126af2a721cb3f467f3a6db9f7 (patch)
treeaa109d560c5c340aa537c1e59b866be5acd62205 /doc/nx-X11_vs_XOrg69_patches/pixmap.c.NX.patch
parent2eb85d140fdd582e6bf7086f0bbba08fa58c836c (diff)
downloadnx-libs-abd6cf1bdd661f126af2a721cb3f467f3a6db9f7.tar.gz
nx-libs-abd6cf1bdd661f126af2a721cb3f467f3a6db9f7.tar.bz2
nx-libs-abd6cf1bdd661f126af2a721cb3f467f3a6db9f7.zip
rename original NX patches, so that we can see the patched file's name in the patch file name.
Diffstat (limited to 'doc/nx-X11_vs_XOrg69_patches/pixmap.c.NX.patch')
-rw-r--r--doc/nx-X11_vs_XOrg69_patches/pixmap.c.NX.patch18
1 files changed, 0 insertions, 18 deletions
diff --git a/doc/nx-X11_vs_XOrg69_patches/pixmap.c.NX.patch b/doc/nx-X11_vs_XOrg69_patches/pixmap.c.NX.patch
deleted file mode 100644
index 77b32d21c..000000000
--- a/doc/nx-X11_vs_XOrg69_patches/pixmap.c.NX.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- ./nx-X11/programs/Xserver/dix/pixmap.c.X.original 2015-02-13 14:03:44.704442298 +0100
-+++ ./nx-X11/programs/Xserver/dix/pixmap.c 2015-02-10 19:13:13.696689930 +0100
-@@ -121,7 +121,14 @@
- if (pScreen->totalPixmapSize > ((size_t)-1) - pixDataSize)
- return NullPixmap;
-
-- pPixmap = (PixmapPtr)xalloc(pScreen->totalPixmapSize + pixDataSize);
-+ /*
-+ * FIXME: Allocate 4 bytes at the end of each pixmap. This
-+ * is a quick workaround intended to fix a problem reported
-+ * by Valgrind due to fbBlt() writing just after the end of
-+ * the pixmap buffer. This may be a RENDER bug.
-+ */
-+
-+ pPixmap = (PixmapPtr)xalloc(pScreen->totalPixmapSize + pixDataSize + 4);
- if (!pPixmap)
- return NullPixmap;
- ppriv = (DevUnion *)(pPixmap + 1);