aboutsummaryrefslogtreecommitdiff
path: root/libX11/src/PutImage.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2009-07-25 12:38:10 +0000
committermarha <marha@users.sourceforge.net>2009-07-25 12:38:10 +0000
commitc87efef42f76c2ff0dcfad2842ab369beffd21de (patch)
tree0ded972bd95879c77ed8fae6c84d0657fbdba660 /libX11/src/PutImage.c
parent1dad159fe09ac3a88b21b98544880e5ecc0e8d54 (diff)
downloadvcxsrv-c87efef42f76c2ff0dcfad2842ab369beffd21de.tar.gz
vcxsrv-c87efef42f76c2ff0dcfad2842ab369beffd21de.tar.bz2
vcxsrv-c87efef42f76c2ff0dcfad2842ab369beffd21de.zip
Added libX11-1.2.2.tar.gz.
Diffstat (limited to 'libX11/src/PutImage.c')
-rw-r--r--libX11/src/PutImage.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/libX11/src/PutImage.c b/libX11/src/PutImage.c
index b528eb920..32223571f 100644
--- a/libX11/src/PutImage.c
+++ b/libX11/src/PutImage.c
@@ -684,7 +684,7 @@ SendXYImage(
if ((dpy->bufptr + length) > dpy->bufmax) {
if ((buf = _XAllocScratch(dpy, (unsigned long) (length))) == NULL) {
UnGetReq(PutImage);
- return;
+ return;
}
}
else
@@ -872,7 +872,7 @@ PutImageRequest(
SendZImage(dpy, req, image, req_xoffset, req_yoffset,
dest_bits_per_pixel, dest_scanline_pad);
}
-
+
static void
PutSubImage (
register Display *dpy,
@@ -891,7 +891,7 @@ PutSubImage (
if ((req_width == 0) || (req_height == 0))
return;
-
+
Available = ((65536 < dpy->max_request_size) ? (65536 << 2)
: (dpy->max_request_size << 2))
- SIZEOF(xPutImageReq);
@@ -907,7 +907,7 @@ PutSubImage (
}
if ((BytesPerRow * req_height) <= Available) {
- PutImageRequest(dpy, d, gc, image, req_xoffset, req_yoffset, x, y,
+ PutImageRequest(dpy, d, gc, image, req_xoffset, req_yoffset, x, y,
req_width, req_height,
dest_bits_per_pixel, dest_scanline_pad);
} else if (req_height > 1) {
@@ -916,11 +916,11 @@ PutSubImage (
if (SubImageHeight == 0)
SubImageHeight = 1;
- PutSubImage(dpy, d, gc, image, req_xoffset, req_yoffset, x, y,
+ PutSubImage(dpy, d, gc, image, req_xoffset, req_yoffset, x, y,
req_width, (unsigned int) SubImageHeight,
dest_bits_per_pixel, dest_scanline_pad);
- PutSubImage(dpy, d, gc, image, req_xoffset,
+ PutSubImage(dpy, d, gc, image, req_xoffset,
req_yoffset + SubImageHeight, x, y + SubImageHeight,
req_width, req_height - SubImageHeight,
dest_bits_per_pixel, dest_scanline_pad);
@@ -928,11 +928,11 @@ PutSubImage (
int SubImageWidth = (((Available << 3) / dest_scanline_pad)
* dest_scanline_pad) - left_pad;
- PutSubImage(dpy, d, gc, image, req_xoffset, req_yoffset, x, y,
+ PutSubImage(dpy, d, gc, image, req_xoffset, req_yoffset, x, y,
(unsigned int) SubImageWidth, 1,
dest_bits_per_pixel, dest_scanline_pad);
- PutSubImage(dpy, d, gc, image, req_xoffset + SubImageWidth,
+ PutSubImage(dpy, d, gc, image, req_xoffset + SubImageWidth,
req_yoffset, x + SubImageWidth, y,
req_width - SubImageWidth, 1,
dest_bits_per_pixel, dest_scanline_pad);
@@ -950,7 +950,7 @@ XPutImage (
int req_yoffset,
int x,
int y,
- unsigned int req_width,
+ unsigned int req_width,
unsigned int req_height)
{