[X2Go-Commits] [nx-libs] 02/03: Xserver/hw/nxagent/Image.c: Fix regression FTBFS after d4465b71 got merged in.

git-admin at x2go.org git-admin at x2go.org
Fri Dec 15 12:45:15 CET 2017


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch 3.6.x
in repository nx-libs.

commit 4fb495432bef33de1f39f2b999054c3712444246
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Dec 15 12:05:16 2017 +0100

    Xserver/hw/nxagent/Image.c: Fix regression FTBFS after d4465b71 got merged in.
---
 nx-X11/programs/Xserver/hw/nxagent/Image.c | 8 ++++----
 1 file 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 978272f..c933c4a 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)
   {

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git


More information about the x2go-commits mailing list