diff options
author | marha <marha@users.sourceforge.net> | 2011-09-19 13:39:03 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2011-09-19 13:39:03 +0200 |
commit | 1678a69116d1c6ce900fe15f7813613bb28416dd (patch) | |
tree | 9589536f6b4bd60b34f90cf5ed20240d40bbb38c /libXmu/src/DrawLogo.c | |
parent | 9d911bc1246139019e555f443e934677a067bc0a (diff) | |
parent | b2c925e360e2c366526de15b44603f855f94139c (diff) | |
download | vcxsrv-1678a69116d1c6ce900fe15f7813613bb28416dd.tar.gz vcxsrv-1678a69116d1c6ce900fe15f7813613bb28416dd.tar.bz2 vcxsrv-1678a69116d1c6ce900fe15f7813613bb28416dd.zip |
Merge remote-tracking branch 'origin/released'
Conflicts:
libfontenc/src/fontenc.c
Diffstat (limited to 'libXmu/src/DrawLogo.c')
-rw-r--r-- | libXmu/src/DrawLogo.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libXmu/src/DrawLogo.c b/libXmu/src/DrawLogo.c index 4af89b530..21dbe3855 100644 --- a/libXmu/src/DrawLogo.c +++ b/libXmu/src/DrawLogo.c @@ -27,7 +27,7 @@ in this Software without prior written authorization from The Open Group. #ifdef HAVE_CONFIG_H #include <config.h> #endif -#include <X11/Xlib.h> +#include <X11/Xlib.h> #include <X11/Xmu/Drawing.h> /* @@ -57,10 +57,10 @@ XmuDrawLogo(Display *dpy, Drawable drawable, GC gcFore, GC gcBack, x += (width - size) >> 1; y += (height - size) >> 1; -/* +/* * Draw what will be the thin strokes. * - * ----- + * ----- * / / * / / * / / @@ -81,10 +81,10 @@ XmuDrawLogo(Display *dpy, Drawable drawable, GC gcFore, GC gcBack, poly[3].x = x + d31; poly[3].y = y + size; XFillPolygon(dpy, drawable, gcFore, poly, 4, Convex, CoordModeOrigin); -/* +/* * Erase area not needed for lower thin stroke. * - * ------ + * ------ * / / * / __ / * / / / @@ -98,10 +98,10 @@ XmuDrawLogo(Display *dpy, Drawable drawable, GC gcFore, GC gcBack, poly[3].x = x + d31; poly[3].y = y + size; XFillPolygon(dpy, drawable, gcBack, poly, 4, Convex, CoordModeOrigin); -/* +/* * Erase area not needed for upper thin stroke. * - * ------ + * ------ * / / / * /--/ / * / / @@ -134,7 +134,7 @@ XmuDrawLogo(Display *dpy, Drawable drawable, GC gcFore, GC gcBack, poly[3].x = x + size - size/4; poly[3].y = y + size; XFillPolygon(dpy, drawable, gcFore, poly, 4, Convex, CoordModeOrigin); -/* +/* * Erase to create gap. * * / |