|
 |
288618 |
diff -up tigervnc-1.4.2/unix/xserver/hw/vnc/xorg-version.h.xserver117 tigervnc-1.4.2/unix/xserver/hw/vnc/xorg-version.h
|
|
|
288618 |
--- tigervnc-1.4.2/unix/xserver/hw/vnc/xorg-version.h.xserver117 2015-01-23 23:37:23.000000000 +0000
|
|
|
288618 |
+++ tigervnc-1.4.2/unix/xserver/hw/vnc/xorg-version.h 2015-02-13 17:35:29.847294663 +0000
|
|
|
288618 |
@@ -48,8 +48,10 @@
|
|
|
288618 |
#define XORG 115
|
|
|
288618 |
#elif XORG_VERSION_CURRENT < ((1 * 10000000) + (16 * 100000) + (99 * 1000))
|
|
|
288618 |
#define XORG 116
|
|
|
288618 |
+#elif XORG_VERSION_CURRENT < ((1 * 10000000) + (17 * 100000) + (99 * 1000))
|
|
|
288618 |
+#define XORG 117
|
|
|
288618 |
#else
|
|
|
288618 |
-#error "X.Org newer than 1.16 is not supported"
|
|
|
288618 |
+#error "X.Org newer than 1.17 is not supported"
|
|
|
288618 |
#endif
|
|
|
288618 |
|
|
|
288618 |
#endif
|
|
|
288618 |
diff -up tigervnc-1.4.2/unix/xserver/hw/vnc/xvnc.cc.xserver117 tigervnc-1.4.2/unix/xserver/hw/vnc/xvnc.cc
|
|
|
288618 |
--- tigervnc-1.4.2/unix/xserver/hw/vnc/xvnc.cc.xserver117 2015-01-23 23:37:23.000000000 +0000
|
|
|
288618 |
+++ tigervnc-1.4.2/unix/xserver/hw/vnc/xvnc.cc 2015-02-13 17:35:27.963265774 +0000
|
|
|
288618 |
@@ -717,9 +717,9 @@ vfbInstallColormap(ColormapPtr pmap)
|
|
|
288618 |
entries = pmap->pVisual->ColormapEntries;
|
|
|
288618 |
pVisual = pmap->pVisual;
|
|
|
288618 |
|
|
|
288618 |
- ppix = (Pixel *)xalloc(entries * sizeof(Pixel));
|
|
|
288618 |
- prgb = (xrgb *)xalloc(entries * sizeof(xrgb));
|
|
|
288618 |
- defs = (xColorItem *)xalloc(entries * sizeof(xColorItem));
|
|
|
288618 |
+ ppix = (Pixel *)calloc(entries, sizeof(Pixel));
|
|
|
288618 |
+ prgb = (xrgb *)calloc(entries, sizeof(xrgb));
|
|
|
288618 |
+ defs = (xColorItem *)calloc(entries, sizeof(xColorItem));
|
|
|
288618 |
|
|
|
288618 |
for (i = 0; i < entries; i++) ppix[i] = i;
|
|
|
288618 |
/* XXX truecolor */
|
|
|
288618 |
@@ -738,9 +738,9 @@ vfbInstallColormap(ColormapPtr pmap)
|
|
|
288618 |
}
|
|
|
288618 |
(*pmap->pScreen->StoreColors)(pmap, entries, defs);
|
|
|
288618 |
|
|
|
288618 |
- xfree(ppix);
|
|
|
288618 |
- xfree(prgb);
|
|
|
288618 |
- xfree(defs);
|
|
|
288618 |
+ free(ppix);
|
|
|
288618 |
+ free(prgb);
|
|
|
288618 |
+ free(defs);
|
|
|
288618 |
}
|
|
|
288618 |
}
|
|
|
288618 |
|