Synchronised line endinge with release branch

1 files changed, 82 insertions, 82 deletions

diff --git a/libXmu/src/CrPixFBit.c b/libXmu/src/CrPixFBit.c
index 55fe788b5..9489a19a0 100644
--- a/libXmu/src/CrPixFBit.c
+++ b/libXmu/src/CrPixFBit.c
@@ -1,82 +1,82 @@
-/*

-

-Copyright 1988, 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.

-

-*/

-

-/*

- * This file contains miscellaneous utility routines and is not part of the

- * Xlib standard.

- */

-

-/*

- * Public entry points:

- *

- *     XmuCreatePixmapFromBitmap	make a pixmap from a bitmap

- */

-

-#ifdef HAVE_CONFIG_H

-#include <config.h>

-#endif

-#include <X11/Xos.h>

-#include <X11/Xlib.h>

-#include <X11/Xmu/Drawing.h>

-

-Pixmap

-XmuCreatePixmapFromBitmap(Display *dpy, Drawable d, Pixmap bitmap,

-			  unsigned int width, unsigned int height,

-			  unsigned int depth,

-			  unsigned long fore, unsigned long back)

-     /*

-      * dpy		-	connection to X server

-      * d		-	drawable indicating screen

-      * bitmap		-	single plane pixmap

-      * width, height	-	dimensions of bitmap and pixmap

-      * depth		-	depth of pixmap to create

-      * fore, back	-	colors to use

-      */

-{

-    Pixmap pixmap;

-

-    pixmap = XCreatePixmap (dpy, d, width, height, depth);

-    if (pixmap != None) {

-	GC gc;

-	XGCValues xgcv;

-

-	xgcv.foreground = fore;

-	xgcv.background = back;

-	xgcv.graphics_exposures = False;

-

-	gc = XCreateGC (dpy, d,

-			(GCForeground | GCBackground | GCGraphicsExposures),

-			&xgcv);

-	if (gc) {

-	    XCopyPlane (dpy, bitmap, pixmap, gc, 0, 0, width, height, 0, 0, 1);

-	    XFreeGC (dpy, gc);

-	} else {

-	    XFreePixmap (dpy, pixmap);

-	    pixmap = None;

-	}

-    }

-    return pixmap;

-}

+/*
+
+Copyright 1988, 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.
+
+*/
+
+/*
+ * This file contains miscellaneous utility routines and is not part of the
+ * Xlib standard.
+ */
+
+/*
+ * Public entry points:
+ *
+ *     XmuCreatePixmapFromBitmap	make a pixmap from a bitmap
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <X11/Xos.h>
+#include <X11/Xlib.h>
+#include <X11/Xmu/Drawing.h>
+
+Pixmap
+XmuCreatePixmapFromBitmap(Display *dpy, Drawable d, Pixmap bitmap,
+			  unsigned int width, unsigned int height,
+			  unsigned int depth,
+			  unsigned long fore, unsigned long back)
+     /*
+      * dpy		-	connection to X server
+      * d		-	drawable indicating screen
+      * bitmap		-	single plane pixmap
+      * width, height	-	dimensions of bitmap and pixmap
+      * depth		-	depth of pixmap to create
+      * fore, back	-	colors to use
+      */
+{
+    Pixmap pixmap;
+
+    pixmap = XCreatePixmap (dpy, d, width, height, depth);
+    if (pixmap != None) {
+	GC gc;
+	XGCValues xgcv;
+
+	xgcv.foreground = fore;
+	xgcv.background = back;
+	xgcv.graphics_exposures = False;
+
+	gc = XCreateGC (dpy, d,
+			(GCForeground | GCBackground | GCGraphicsExposures),
+			&xgcv);
+	if (gc) {
+	    XCopyPlane (dpy, bitmap, pixmap, gc, 0, 0, width, height, 0, 0, 1);
+	    XFreeGC (dpy, gc);
+	} else {
+	    XFreePixmap (dpy, pixmap);
+	    pixmap = None;
+	}
+    }
+    return pixmap;
+}