Annotation of /trunk/tigervnc/patches/tigervnc-1.5.0-xserver117.patch
Parent Directory | Revision Log
Revision 2621 -
(hide annotations)
(download)
Thu Jul 16 06:59:55 2015 UTC (9 years, 2 months ago) by niro
File size: 1683 byte(s)
Thu Jul 16 06:59:55 2015 UTC (9 years, 2 months ago) by niro
File size: 1683 byte(s)
-fixes for 1.5.0
1 | niro | 2621 | 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 |
2 | --- tigervnc-1.4.2/unix/xserver/hw/vnc/xorg-version.h.xserver117 2015-01-23 23:37:23.000000000 +0000 | ||
3 | +++ tigervnc-1.4.2/unix/xserver/hw/vnc/xorg-version.h 2015-02-13 17:35:29.847294663 +0000 | ||
4 | @@ -48,8 +48,10 @@ | ||
5 | #define XORG 115 | ||
6 | #elif XORG_VERSION_CURRENT < ((1 * 10000000) + (16 * 100000) + (99 * 1000)) | ||
7 | #define XORG 116 | ||
8 | +#elif XORG_VERSION_CURRENT < ((1 * 10000000) + (17 * 100000) + (99 * 1000)) | ||
9 | +#define XORG 117 | ||
10 | #else | ||
11 | -#error "X.Org newer than 1.16 is not supported" | ||
12 | +#error "X.Org newer than 1.17 is not supported" | ||
13 | #endif | ||
14 | |||
15 | #endif | ||
16 | diff -up tigervnc-1.4.2/unix/xserver/hw/vnc/xvnc.cc.xserver117 tigervnc-1.4.2/unix/xserver/hw/vnc/xvnc.cc | ||
17 | --- tigervnc-1.4.2/unix/xserver/hw/vnc/xvnc.cc.xserver117 2015-01-23 23:37:23.000000000 +0000 | ||
18 | +++ tigervnc-1.4.2/unix/xserver/hw/vnc/xvnc.cc 2015-02-13 17:35:27.963265774 +0000 | ||
19 | @@ -717,9 +717,9 @@ vfbInstallColormap(ColormapPtr pmap) | ||
20 | entries = pmap->pVisual->ColormapEntries; | ||
21 | pVisual = pmap->pVisual; | ||
22 | |||
23 | - ppix = (Pixel *)xalloc(entries * sizeof(Pixel)); | ||
24 | - prgb = (xrgb *)xalloc(entries * sizeof(xrgb)); | ||
25 | - defs = (xColorItem *)xalloc(entries * sizeof(xColorItem)); | ||
26 | + ppix = (Pixel *)malloc(entries * sizeof(Pixel)); | ||
27 | + prgb = (xrgb *)malloc(entries * sizeof(xrgb)); | ||
28 | + defs = (xColorItem *)malloc(entries * sizeof(xColorItem)); | ||
29 | |||
30 | for (i = 0; i < entries; i++) ppix[i] = i; | ||
31 | /* XXX truecolor */ | ||
32 | @@ -738,9 +738,9 @@ vfbInstallColormap(ColormapPtr pmap) | ||
33 | } | ||
34 | (*pmap->pScreen->StoreColors)(pmap, entries, defs); | ||
35 | |||
36 | - xfree(ppix); | ||
37 | - xfree(prgb); | ||
38 | - xfree(defs); | ||
39 | + free(ppix); | ||
40 | + free(prgb); | ||
41 | + free(defs); | ||
42 | } | ||
43 | } | ||
44 |