summaryrefslogtreecommitdiff
path: root/src/scan.c
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2011-09-16 22:48:53 -0700
committerAlan Coopersmith <alan.coopersmith@oracle.com>2011-09-16 22:48:53 -0700
commit3ea70059805b3ebc795f797b5880b90b6b3a9235 (patch)
tree580e215d33f103506e983e4b67739c587d8f8c5a /src/scan.c
parent0c9e200c3975917f5d78eac67b1f4cedefd73079 (diff)
Strip trailing whitespace
Performed with: find * -type f | xargs perl -i -p -e 's{[ \t]+$}{}' git diff -w & git diff -b show no diffs from this change Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Diffstat (limited to 'src/scan.c')
-rw-r--r--src/scan.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/src/scan.c b/src/scan.c
index d2780a1..858f274 100644
--- a/src/scan.c
+++ b/src/scan.c
@@ -111,8 +111,8 @@ LFUNC(MSWGetImagePixels, int, (Display *d, XImage *image, unsigned int width,
LFUNC(ScanTransparentColor, int, (XpmColor *color, unsigned int cpp,
XpmAttributes *attributes));
-LFUNC(ScanOtherColors, int, (Display *display, XpmColor *colors,
- unsigned int ncolors,
+LFUNC(ScanOtherColors, int, (Display *display, XpmColor *colors,
+ unsigned int ncolors,
Pixel *pixels, unsigned int mask,
unsigned int cpp, XpmAttributes *attributes));
@@ -244,7 +244,7 @@ XpmCreateXpmImageFromImage(
if (!pmap.pixelindex)
RETURN(XpmNoMemory);
- if (pmap.size >= UINT_MAX / sizeof(Pixel))
+ if (pmap.size >= UINT_MAX / sizeof(Pixel))
RETURN(XpmNoMemory);
pmap.pixels = (Pixel *) XpmMalloc(sizeof(Pixel) * pmap.size);
@@ -273,10 +273,10 @@ XpmCreateXpmImageFromImage(
/*
* scan the image data
- *
+ *
* In case depth is 1 or bits_per_pixel is 4, 6, 8, 24 or 32 use optimized
* functions, otherwise use slower but sure general one.
- *
+ *
*/
if (image) {
@@ -433,8 +433,8 @@ ScanOtherColors(
#ifndef FOR_MSW
xpmRgbName rgbn[MAX_RGBNAMES];
#else
- xpmRgbName *rgbn = NULL;
-#endif
+ xpmRgbName *rgbn = NULL;
+#endif
int rgbn_max = 0;
unsigned int i, j, c, i2;
XpmColor *color;
@@ -559,10 +559,10 @@ ScanOtherColors(
#ifndef FOR_MSW
sprintf(buf, "#%04X%04X%04X",
xcolor->red, xcolor->green, xcolor->blue);
-#else
+#else
sprintf(buf, "#%02x%02x%02x",
xcolor->red, xcolor->green, xcolor->blue);
-#endif
+#endif
color->c_color = (char *) xpmstrdup(buf);
}
if (!color->c_color) {
@@ -924,15 +924,15 @@ AGetImagePixels (
unsigned int x, y;
unsigned char *pixels;
XImage *tmp_img;
-
+
pixels = XpmMalloc ((((width+15)>>4)<<4)*sizeof (*pixels));
if (pixels == NULL)
return XpmNoMemory;
-
+
tmp_img = AllocXImage ((((width+15)>>4)<<4), 1, image->rp->BitMap->Depth);
if (tmp_img == NULL)
CLEAN_UP (XpmNoMemory);
-
+
iptr = pmap->pixelindex;
for (y = 0; y < height; ++y)
{
@@ -943,7 +943,7 @@ AGetImagePixels (
CLEAN_UP (XpmNoMemory);
}
}
-
+
CLEAN_UP (XpmSuccess);
}