diff options
author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2023-04-27 14:23:39 +0200 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2023-04-27 14:23:39 +0200 |
commit | 9b94209f53782ecaf7084722ce90836573ceb86b (patch) | |
tree | 42354553aeeb29d9490a3120f0c5cd687cbad370 /nx-X11/programs/Xserver/hw/nxagent/Image.c | |
parent | 91d9218c0cc659f40918af6ac6c035c6c48d2c6d (diff) | |
parent | 16f6803f1597788b3bebcfa15e8900d8420b54a4 (diff) | |
download | nx-libs-9b94209f53782ecaf7084722ce90836573ceb86b.tar.gz nx-libs-9b94209f53782ecaf7084722ce90836573ceb86b.tar.bz2 nx-libs-9b94209f53782ecaf7084722ce90836573ceb86b.zip |
Merge branch 'uli42-pr/various9' into 3.6.x
Attributes GH PR #1029: https://github.com/ArcticaProject/nx-libs/pull/1029
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Image.c')
-rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Image.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Image.c b/nx-X11/programs/Xserver/hw/nxagent/Image.c index c033bf70d..a8ccef8ac 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Image.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Image.c @@ -629,7 +629,7 @@ FIXME: Should use these. pRegion -> extents.y1, pRegion -> extents.x2, pRegion -> extents.y2, (void *) pDrawable); #endif - + nxagentMarkCorruptedRegion(pDrawable, pRegion); goto nxagentPutImageEnd; @@ -647,7 +647,7 @@ FIXME: Should use these. pRegion -> extents.y1, pRegion -> extents.x2, pRegion -> extents.y2, (void *) pDrawable); #endif - + nxagentMarkCorruptedRegion(pDrawable, pRegion); goto nxagentPutImageEnd; @@ -915,9 +915,9 @@ void nxagentRealizeImage(DrawablePtr pDrawable, GCPtr pGC, int depth, #ifdef WARNING fprintf(stderr, "nxagentRealizeImage: WARNING! Visual not found. Using default visual.\n"); #endif - + pVisual = nxagentVisuals[nxagentDefaultVisualIndex].visual; - } + } /* * Get bytes per line according to format. @@ -1089,7 +1089,7 @@ FIXME: Should use an unpack resource here. if (client == NULL) { client = serverClient; - + #ifdef TEST fprintf(stderr, "nxagentPutSubImage: WARNING! Using the server client with index [%d].\n", client -> index); @@ -1405,7 +1405,7 @@ FIXME: There should be a callback registered by the agent that * Add the image only if we have a valid checksum. This is the * case only if we originally tried to find the image in cache. */ - + if (NXImageCacheSize > 0 && packedChecksum != NULL) { #ifdef DEBUG @@ -1608,7 +1608,7 @@ int nxagentScaleImage(int x, int y, unsigned xRatio, unsigned yRatio, if (newImage -> data == NULL) { SAFE_free(newImage); - + #ifdef PANIC fprintf(stderr, "nxagentScaleImage: PANIC! Failed to create the target image data.\n"); #endif @@ -1703,4 +1703,3 @@ char *nxagentAllocateImageData(int width, int height, int depth, int *length, in return data; } - |