guijan
/
legacy-imlib2
forked from old/legacy-imlib2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

better loader... ignore trailing garbage xv puts on the end of an xpm... 

SVN revision: 6927
This commit is contained in:
Carsten Haitzler 2003-05-22 23:42:33 +00:00
parent 21be015cdb
commit abcfd77cef
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
loaders/loader_xpm.c
View File

@ -117,6 +117,7 @@ load(ImlibImage *im, ImlibProgressFunction progress, char progress_granularity,
short lookup[128 - 32][128 - 32]; short lookup[128 - 32][128 - 32];
float per = 0.0, per_inc = 0.0; float per = 0.0, per_inc = 0.0;
int last_per = 0, last_y = 0; int last_per = 0, last_y = 0;
int count, pixels;
done = 0; done = 0;
transp = -1; transp = -1;
@ -156,7 +157,10 @@ load(ImlibImage *im, ImlibProgressFunction progress, char progress_granularity,
comment = 0; comment = 0;
quote = 0; quote = 0;
context = 0; context = 0;
pixels = 0;
count = 0;
line = malloc(lsz); line = malloc(lsz);
memset(lookup, 0, sizeof(lookup));
while (!done) while (!done)
{ {
pc = c; pc = c;
@ -342,6 +346,7 @@ load(ImlibImage *im, ImlibProgressFunction progress, char progress_granularity,
} }
ptr = im->data; ptr = im->data;
end = ptr + (sizeof(DATA32) * w * h); end = ptr + (sizeof(DATA32) * w * h);
pixels = w * h;
} }
else else
{ {
@ -373,6 +378,7 @@ load(ImlibImage *im, ImlibProgressFunction progress, char progress_granularity,
g = (unsigned char)cmap[lookup[(int)col[0] - 32][0]].g; g = (unsigned char)cmap[lookup[(int)col[0] - 32][0]].g;
b = (unsigned char)cmap[lookup[(int)col[0] - 32][0]].b; b = (unsigned char)cmap[lookup[(int)col[0] - 32][0]].b;
*ptr++ = 0x00ffffff & ((r << 16) | (g << 8) | b); *ptr++ = 0x00ffffff & ((r << 16) | (g << 8) | b);
count++;
} }
else else
{ {
@ -380,6 +386,7 @@ load(ImlibImage *im, ImlibProgressFunction progress, char progress_granularity,
g = (unsigned char)cmap[lookup[(int)col[0] - 32][0]].g; g = (unsigned char)cmap[lookup[(int)col[0] - 32][0]].g;
b = (unsigned char)cmap[lookup[(int)col[0] - 32][0]].b; b = (unsigned char)cmap[lookup[(int)col[0] - 32][0]].b;
*ptr++ = (0xff << 24) | (r << 16) | (g << 8) | b; *ptr++ = (0xff << 24) | (r << 16) | (g << 8) | b;
count++;
} }
} }
} }
@ -392,6 +399,7 @@ load(ImlibImage *im, ImlibProgressFunction progress, char progress_granularity,
g = (unsigned char)cmap[lookup[(int)col[0] - 32][0]].g; g = (unsigned char)cmap[lookup[(int)col[0] - 32][0]].g;
b = (unsigned char)cmap[lookup[(int)col[0] - 32][0]].b; b = (unsigned char)cmap[lookup[(int)col[0] - 32][0]].b;
*ptr++ = (0xff << 24) | (r << 16) | (g << 8) | b; *ptr++ = (0xff << 24) | (r << 16) | (g << 8) | b;
count++;
} }
} }
} }
@ -409,6 +417,7 @@ load(ImlibImage *im, ImlibProgressFunction progress, char progress_granularity,
g = (unsigned char)cmap[lookup[(int)col[0] - 32][(int)col[1] - 32]].g; g = (unsigned char)cmap[lookup[(int)col[0] - 32][(int)col[1] - 32]].g;
b = (unsigned char)cmap[lookup[(int)col[0] - 32][(int)col[1] - 32]].b; b = (unsigned char)cmap[lookup[(int)col[0] - 32][(int)col[1] - 32]].b;
*ptr++ = 0x00ffffff & ((r << 16) | (g << 8) | b); *ptr++ = 0x00ffffff & ((r << 16) | (g << 8) | b);
count++;
} }
else else
{ {
@ -416,6 +425,7 @@ load(ImlibImage *im, ImlibProgressFunction progress, char progress_granularity,
g = (unsigned char)cmap[lookup[(int)col[0] - 32][(int)col[1] - 32]].g; g = (unsigned char)cmap[lookup[(int)col[0] - 32][(int)col[1] - 32]].g;
b = (unsigned char)cmap[lookup[(int)col[0] - 32][(int)col[1] - 32]].b; b = (unsigned char)cmap[lookup[(int)col[0] - 32][(int)col[1] - 32]].b;
*ptr++ = (0xff << 24) | (r << 16) | (g << 8) | b; *ptr++ = (0xff << 24) | (r << 16) | (g << 8) | b;
count++;
} }
} }
} }
@ -429,6 +439,7 @@ load(ImlibImage *im, ImlibProgressFunction progress, char progress_granularity,
g = (unsigned char)cmap[lookup[(int)col[0] - 32][(int)col[1] - 32]].g; g = (unsigned char)cmap[lookup[(int)col[0] - 32][(int)col[1] - 32]].g;
b = (unsigned char)cmap[lookup[(int)col[0] - 32][(int)col[1] - 32]].b; b = (unsigned char)cmap[lookup[(int)col[0] - 32][(int)col[1] - 32]].b;
*ptr++ = (0xff << 24) | (r << 16) | (g << 8) | b; *ptr++ = (0xff << 24) | (r << 16) | (g << 8) | b;
count++;
} }
} }
} }
@ -454,6 +465,7 @@ load(ImlibImage *im, ImlibProgressFunction progress, char progress_granularity,
g = (unsigned char)cmap[lookup[(int)col[0] - 32][0]].g; g = (unsigned char)cmap[lookup[(int)col[0] - 32][0]].g;
b = (unsigned char)cmap[lookup[(int)col[0] - 32][0]].b; b = (unsigned char)cmap[lookup[(int)col[0] - 32][0]].b;
*ptr++ = 0x00ffffff & ((r << 16) | (g << 8) | b); *ptr++ = 0x00ffffff & ((r << 16) | (g << 8) | b);
count++;
} }
else else
{ {
@ -461,6 +473,7 @@ load(ImlibImage *im, ImlibProgressFunction progress, char progress_granularity,
g = (unsigned char)cmap[j].g; g = (unsigned char)cmap[j].g;
b = (unsigned char)cmap[j].b; b = (unsigned char)cmap[j].b;
*ptr++ = (0xff << 24) | (r << 16) | (g << 8) | b; *ptr++ = (0xff << 24) | (r << 16) | (g << 8) | b;
count++;
} }
j = ncolors; j = ncolors;
} }
@ -485,6 +498,7 @@ load(ImlibImage *im, ImlibProgressFunction progress, char progress_granularity,
g = (unsigned char)cmap[j].g; g = (unsigned char)cmap[j].g;
b = (unsigned char)cmap[j].b; b = (unsigned char)cmap[j].b;
*ptr++ = (0xff << 24) | (r << 16) | (g << 8) | b; *ptr++ = (0xff << 24) | (r << 16) | (g << 8) | b;
count++;
j = ncolors; j = ncolors;
} }
} }
@ -522,7 +536,8 @@ load(ImlibImage *im, ImlibProgressFunction progress, char progress_granularity,
lsz += 256; lsz += 256;
line = realloc(line, lsz); line = realloc(line, lsz);
} }
if ((ptr) && ((ptr - im->data) >= w * h * sizeof(DATA32))) if (((ptr) && ((ptr - im->data) >= (w * h * sizeof(DATA32)))) ||
((context > 1) && (count >= pixels)))
done = 1; done = 1;
} }
@ -531,6 +546,7 @@ load(ImlibImage *im, ImlibProgressFunction progress, char progress_granularity,
progress(im, 100, 0, last_y, w, h); progress(im, 100, 0, last_y, w, h);
} }
fclose(f);
free(cmap); free(cmap);
free(line); free(line);