gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-19 12:28:22 +01:00
Code Issues Projects Releases Wiki Activity

Fixed buggy RSaveXPM() in wraster library.

Browse Source
This commit is contained in:
dan
1999-07-25 20:28:30 +00:00
parent e0423a1276
commit d7384c2e07
2 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -6,6 +6,8 @@ Changes since version 0.60.0:
- fixed crash when displaying workspace name in some positions. - fixed crash when displaying workspace name in some positions.
- fixed compilation problem when WS_INDICATOR was defined. - fixed compilation problem when WS_INDICATOR was defined.
- added edge attraction. See NEWS. - added edge attraction. See NEWS.
- fixed buggy RSaveXPM() in wraster library. Its output was messed up, and
caused crashes for icons with more than 1024 colors.
Changes since version 0.53.0: Changes since version 0.53.0:

23
wrlib/nxpm.c
View File

@@ -483,13 +483,13 @@ addcolor(XPMColor **list, unsigned r, unsigned g, unsigned b, int *colors)
static char* static char*
index2str(char *buffer, int index, int colorCount) index2str(char *buffer, int index, int charsPerPixel)
{ {
int i; int i;
for (i=0; i<colorCount/64+1; i++) { for (i=0; i<charsPerPixel; i++) {
buffer[i] = I2CHAR(index&63); buffer[i] = I2CHAR(index&63);
index >>= 5; index >>= 6;
} }
buffer[i] = 0; buffer[i] = 0;
@@ -498,7 +498,7 @@ index2str(char *buffer, int index, int colorCount)
static void static void
outputcolormap(FILE *file, XPMColor *colormap, int colorCount) outputcolormap(FILE *file, XPMColor *colormap, int charsPerPixel)
{ {
int index; int index;
char buf[128]; char buf[128];
@@ -509,7 +509,7 @@ outputcolormap(FILE *file, XPMColor *colormap, int colorCount)
for (index=0; colormap!=NULL; colormap=colormap->next,index++) { for (index=0; colormap!=NULL; colormap=colormap->next,index++) {
colormap->index = index; colormap->index = index;
fprintf(file, "\"%s c #%02x%02x%02x\",\n", fprintf(file, "\"%s c #%02x%02x%02x\",\n",
index2str(buf, index, colorCount), colormap->red, index2str(buf, index, charsPerPixel), colormap->red,
colormap->green, colormap->blue); colormap->green, colormap->blue);
} }
} }
@@ -536,6 +536,7 @@ RSaveXPM(RImage *image, char *filename)
FILE *file; FILE *file;
int x, y; int x, y;
int colorCount=0; int colorCount=0;
int charsPerPixel;
XPMColor *colormap = NULL; XPMColor *colormap = NULL;
XPMColor *tmpc; XPMColor *tmpc;
int i; int i;
@@ -572,13 +573,17 @@ RSaveXPM(RImage *image, char *filename)
} }
} }
charsPerPixel = 1;
while ((1 << charsPerPixel*6) < colorCount)
charsPerPixel++;
/* write header info */ /* write header info */
fprintf(file, "\"%i %i %i %i\",\n", image->width, image->height, fprintf(file, "\"%i %i %i %i\",\n", image->width, image->height,
colorCount, colorCount/64+1); colorCount, charsPerPixel);
/* write colormap data */ /* write colormap data */
if (image->data[3]) { if (image->data[3]) {
for (i=0; i<colorCount/64+1; i++) for (i=0; i<charsPerPixel; i++)
transp[i] = ' '; transp[i] = ' ';
transp[i] = 0; transp[i] = 0;
@@ -586,7 +591,7 @@ RSaveXPM(RImage *image, char *filename)
} }
i = 0; i = 0;
outputcolormap(file, colormap, colorCount); outputcolormap(file, colormap, charsPerPixel);
r = image->data[0]; r = image->data[0];
g = image->data[1]; g = image->data[1];
@@ -604,7 +609,7 @@ RSaveXPM(RImage *image, char *filename)
if (!a || *a++>127) { if (!a || *a++>127) {
tmpc = lookfor(colormap, (unsigned)*r<<16|(unsigned)*g<<8|(unsigned)*b); tmpc = lookfor(colormap, (unsigned)*r<<16|(unsigned)*g<<8|(unsigned)*b);
fprintf(file, index2str(buf, tmpc->index, colorCount)); fprintf(file, index2str(buf, tmpc->index, charsPerPixel));
} else { } else {
fprintf(file, transp); fprintf(file, transp);
} }