git update 8/7/2010

1 files changed, 128 insertions, 129 deletions

diff --git a/libX11/src/GetImage.c b/libX11/src/GetImage.c
index 602ba6588..2017b30c6 100644
--- a/libX11/src/GetImage.c
+++ b/libX11/src/GetImage.c
@@ -1,129 +1,128 @@
-/*
-
-Copyright 1986, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-
-#define NEED_REPLIES
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include "Xlibint.h"
-#include <X11/Xutil.h>		/* for XDestroyImage */
-#include "ImUtil.h"
-
-#define ROUNDUP(nbytes, pad) (((((nbytes) - 1) + (pad)) / (pad)) * (pad))
-
-static unsigned int Ones(                /* HACKMEM 169 */
-    unsigned long mask)
-{
-    register unsigned long y;
-
-    y = (mask >> 1) &033333333333;
-    y = mask - y - ((y >>1) & 033333333333);
-    return ((unsigned int) (((y + (y >> 3)) & 030707070707) % 077));
-}
-
-XImage *XGetImage (
-     register Display *dpy,
-     Drawable d,
-     int x,
-     int y,
-     unsigned int width,
-     unsigned int height,
-     unsigned long plane_mask,
-     int format)	/* either XYPixmap or ZPixmap */
-{
-	xGetImageReply rep;
-	register xGetImageReq *req;
-	char *data;
-	long nbytes;
-	XImage *image;
-	LockDisplay(dpy);
-	GetReq (GetImage, req);
-	/*
-	 * first set up the standard stuff in the request
-	 */
-	req->drawable = d;
-	req->x = x;
-	req->y = y;
-	req->width = width;
-	req->height = height;
-	req->planeMask = plane_mask;
-	req->format = format;
-
-	if (_XReply (dpy, (xReply *) &rep, 0, xFalse) == 0 ||
-	    rep.length == 0) {
-		UnlockDisplay(dpy);
-		SyncHandle();
-		return (XImage *)NULL;
-	}
-
-	nbytes = (long)rep.length << 2;
-	data = (char *) Xmalloc((unsigned) nbytes);
-	if (! data) {
-	    _XEatData(dpy, (unsigned long) nbytes);
-	    UnlockDisplay(dpy);
-	    SyncHandle();
-	    return (XImage *) NULL;
-	}
-        _XReadPad (dpy, data, nbytes);
-        if (format == XYPixmap)
-	   image = XCreateImage(dpy, _XVIDtoVisual(dpy, rep.visual),
-		  Ones (plane_mask &
-			(((unsigned long)0xFFFFFFFF) >> (32 - rep.depth))),
-		  format, 0, data, width, height, dpy->bitmap_pad, 0);
-	else /* format == ZPixmap */
-           image = XCreateImage (dpy, _XVIDtoVisual(dpy, rep.visual),
-		 rep.depth, ZPixmap, 0, data, width, height,
-		  _XGetScanlinePad(dpy, (int) rep.depth), 0);
-
-	if (!image)
-	    Xfree(data);
-	UnlockDisplay(dpy);
-	SyncHandle();
-	return (image);
-}
-
-XImage *XGetSubImage(
-     register Display *dpy,
-     Drawable d,
-     int x,
-     int y,
-     unsigned int width,
-     unsigned int height,
-     unsigned long plane_mask,
-     int format,	/* either XYPixmap or ZPixmap */
-     XImage *dest_image,
-     int dest_x,
-     int dest_y)
-{
-	XImage *temp_image;
-	temp_image = XGetImage(dpy, d, x, y, width, height,
-				plane_mask, format);
-	if (!temp_image)
-	    return (XImage *)NULL;
-	_XSetImage(temp_image, dest_image, dest_x, dest_y);
-	XDestroyImage(temp_image);
-	return (dest_image);
-}
+/*

+

+Copyright 1986, 1998  The Open Group

+

+Permission to use, copy, modify, distribute, and sell this software and its

+documentation for any purpose is hereby granted without fee, provided that

+the above copyright notice appear in all copies and that both that

+copyright notice and this permission notice appear in supporting

+documentation.

+

+The above copyright notice and this permission notice shall be included in

+all copies or substantial portions of the Software.

+

+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE

+OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN

+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

+

+Except as contained in this notice, the name of The Open Group shall not be

+used in advertising or otherwise to promote the sale, use or other dealings

+in this Software without prior written authorization from The Open Group.

+

+*/

+

+#ifdef HAVE_CONFIG_H

+#include <config.h>

+#endif

+#include "Xlibint.h"

+#include <X11/Xutil.h>		/* for XDestroyImage */

+#include "ImUtil.h"

+

+#define ROUNDUP(nbytes, pad) (((((nbytes) - 1) + (pad)) / (pad)) * (pad))

+

+static unsigned int Ones(                /* HACKMEM 169 */

+    unsigned long mask)

+{

+    register unsigned long y;

+

+    y = (mask >> 1) &033333333333;

+    y = mask - y - ((y >>1) & 033333333333);

+    return ((unsigned int) (((y + (y >> 3)) & 030707070707) % 077));

+}

+

+XImage *XGetImage (

+     register Display *dpy,

+     Drawable d,

+     int x,

+     int y,

+     unsigned int width,

+     unsigned int height,

+     unsigned long plane_mask,

+     int format)	/* either XYPixmap or ZPixmap */

+{

+	xGetImageReply rep;

+	register xGetImageReq *req;

+	char *data;

+	long nbytes;

+	XImage *image;

+	LockDisplay(dpy);

+	GetReq (GetImage, req);

+	/*

+	 * first set up the standard stuff in the request

+	 */

+	req->drawable = d;

+	req->x = x;

+	req->y = y;

+	req->width = width;

+	req->height = height;

+	req->planeMask = plane_mask;

+	req->format = format;

+

+	if (_XReply (dpy, (xReply *) &rep, 0, xFalse) == 0 ||

+	    rep.length == 0) {

+		UnlockDisplay(dpy);

+		SyncHandle();

+		return (XImage *)NULL;

+	}

+

+	nbytes = (long)rep.length << 2;

+	data = (char *) Xmalloc((unsigned) nbytes);

+	if (! data) {

+	    _XEatData(dpy, (unsigned long) nbytes);

+	    UnlockDisplay(dpy);

+	    SyncHandle();

+	    return (XImage *) NULL;

+	}

+        _XReadPad (dpy, data, nbytes);

+        if (format == XYPixmap)

+	   image = XCreateImage(dpy, _XVIDtoVisual(dpy, rep.visual),

+		  Ones (plane_mask &

+			(((unsigned long)0xFFFFFFFF) >> (32 - rep.depth))),

+		  format, 0, data, width, height, dpy->bitmap_pad, 0);

+	else /* format == ZPixmap */

+           image = XCreateImage (dpy, _XVIDtoVisual(dpy, rep.visual),

+		 rep.depth, ZPixmap, 0, data, width, height,

+		  _XGetScanlinePad(dpy, (int) rep.depth), 0);

+

+	if (!image)

+	    Xfree(data);

+	UnlockDisplay(dpy);

+	SyncHandle();

+	return (image);

+}

+

+XImage *XGetSubImage(

+     register Display *dpy,

+     Drawable d,

+     int x,

+     int y,

+     unsigned int width,

+     unsigned int height,

+     unsigned long plane_mask,

+     int format,	/* either XYPixmap or ZPixmap */

+     XImage *dest_image,

+     int dest_x,

+     int dest_y)

+{

+	XImage *temp_image;

+	temp_image = XGetImage(dpy, d, x, y, width, height,

+				plane_mask, format);

+	if (!temp_image)

+	    return (XImage *)NULL;

+	_XSetImage(temp_image, dest_image, dest_x, dest_y);

+	XDestroyImage(temp_image);

+	return (dest_image);

+}