aboutsummaryrefslogtreecommitdiff
path: root/libXmu/src/LocBitmap.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-09-19 13:39:03 +0200
committermarha <marha@users.sourceforge.net>2011-09-19 13:39:03 +0200
commit1678a69116d1c6ce900fe15f7813613bb28416dd (patch)
tree9589536f6b4bd60b34f90cf5ed20240d40bbb38c /libXmu/src/LocBitmap.c
parent9d911bc1246139019e555f443e934677a067bc0a (diff)
parentb2c925e360e2c366526de15b44603f855f94139c (diff)
downloadvcxsrv-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/LocBitmap.c')
-rw-r--r--libXmu/src/LocBitmap.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/libXmu/src/LocBitmap.c b/libXmu/src/LocBitmap.c
index 0cfbdaa23..b587de7be 100644
--- a/libXmu/src/LocBitmap.c
+++ b/libXmu/src/LocBitmap.c
@@ -1,5 +1,5 @@
/*
-
+
Copyright 1989, 1998 The Open Group
Permission to use, copy, modify, distribute, and sell this software and its
@@ -75,10 +75,10 @@ static char **split_path_string(char*);
Pixmap
XmuLocateBitmapFile(Screen *screen, _Xconst char *name, char *srcname,
- int srcnamelen, int *widthp, int *heightp,
+ int srcnamelen, int *widthp, int *heightp,
int *xhotp, int *yhotp)
{
- return XmuLocatePixmapFile (screen, name,
+ return XmuLocatePixmapFile (screen, name,
(unsigned long) 1, (unsigned long) 0,
(unsigned int) 1, srcname, srcnamelen,
widthp, heightp, xhotp, yhotp);
@@ -89,9 +89,9 @@ XmuLocateBitmapFile(Screen *screen, _Xconst char *name, char *srcname,
* version that reads pixmap data as well as bitmap data
*/
Pixmap
-XmuLocatePixmapFile(Screen *screen, _Xconst char *name,
- unsigned long fore, unsigned long back,
- unsigned int depth,
+XmuLocatePixmapFile(Screen *screen, _Xconst char *name,
+ unsigned long fore, unsigned long back,
+ unsigned int depth,
char *srcname, int srcnamelen,
int *widthp, int *heightp, int *xhotp, int *yhotp)
{
@@ -131,10 +131,10 @@ XmuLocatePixmapFile(Screen *screen, _Xconst char *name,
/* what a hack; need to initialize it */
(void) XGetDefault (dpy, "", "");
}
- if (XrmQGetResource (XrmGetDatabase(dpy), xrm_name, xrm_class,
+ if (XrmQGetResource (XrmGetDatabase(dpy), xrm_name, xrm_class,
&rep_type, &value) &&
rep_type == XrmPermStringToQuark("String")) {
- cache->string_to_bitmap.bitmapFilePath =
+ cache->string_to_bitmap.bitmapFilePath =
split_path_string (value.addr);
}
}
@@ -262,7 +262,7 @@ void
_XmuStringToBitmapFreeCache(register XmuCvtCache *c)
{
if (c->string_to_bitmap.bitmapFilePath) {
- if (c->string_to_bitmap.bitmapFilePath[0])
+ if (c->string_to_bitmap.bitmapFilePath[0])
free (c->string_to_bitmap.bitmapFilePath[0]);
free ((char *) (c->string_to_bitmap.bitmapFilePath));
}