aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/hw
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2017-12-15 12:05:16 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2017-12-15 12:05:16 +0100
commit4fb495432bef33de1f39f2b999054c3712444246 (patch)
tree03c7c387755fea0dfbf19b5683d3c8a607c8c77b /nx-X11/programs/Xserver/hw
parentcfbb0382027f482568651e6e0cd96ce897e4dbf4 (diff)
downloadnx-libs-4fb495432bef33de1f39f2b999054c3712444246.tar.gz
nx-libs-4fb495432bef33de1f39f2b999054c3712444246.tar.bz2
nx-libs-4fb495432bef33de1f39f2b999054c3712444246.zip
Xserver/hw/nxagent/Image.c: Fix regression FTBFS after d4465b71 got merged in.
Diffstat (limited to 'nx-X11/programs/Xserver/hw')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Image.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Image.c b/nx-X11/programs/Xserver/hw/nxagent/Image.c
index 978272f42..c933c4afc 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Image.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Image.c
@@ -311,7 +311,7 @@ char *nxagentImageCopy(XImage *source, XImage *destination)
source -> bytes_per_line * source -> height);
#endif
- destination -> data = Xmalloc(source -> bytes_per_line * source -> height);
+ destination -> data = malloc(source -> bytes_per_line * source -> height);
if (destination -> data == NULL)
{
@@ -344,7 +344,7 @@ char *nxagentImageAlpha(XImage *image)
size = (image -> bytes_per_line * image -> height) >> 2;
- pData = Xmalloc(size);
+ pData = malloc(size);
if (pData == NULL)
{
@@ -457,7 +457,7 @@ FIXME: Here the split trap is always set and so the caching of
{
free(nxagentUnpackAlpha[resource] -> data);
}
- else if ((nxagentUnpackAlpha[resource] = Xmalloc(sizeof(UnpackAlphaRec))) == NULL)
+ else if ((nxagentUnpackAlpha[resource] = malloc(sizeof(UnpackAlphaRec))) == NULL)
{
#ifdef PANIC
fprintf(stderr, "nxagentSetUnpackAlpha: PANIC! Can't allocate data for the alpha structure.\n");
@@ -1712,7 +1712,7 @@ int nxagentScaleImage(int x, int y, unsigned xRatio, unsigned yRatio,
newImage -> byte_order = IMAGE_BYTE_ORDER;
newImage -> bitmap_bit_order = BITMAP_BIT_ORDER;
- newImage -> data = Xmalloc(newImage -> bytes_per_line * newHeight);
+ newImage -> data = malloc(newImage -> bytes_per_line * newHeight);
if (newImage -> data == NULL)
{