qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-02-06 15:51:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

speed up LoadPCX a bit

Browse source
This commit is contained in:
Bill Currie 2002-05-28 06:05:36 +00:00
parent bebf3f9599
commit 9b7b059d5c
1 changed files with 26 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
libs/util/pcx.c
View file

@ -56,7 +56,6 @@ LoadPCX (VFile *f, int convert, byte *pal)
byte *palette; byte *palette;
byte *pix; byte *pix;
byte *dataByte; byte *dataByte;
int x, y;
int runLength = 1; int runLength = 1;
int count; int count;
tex_t *tex; tex_t *tex;
@ -87,8 +86,6 @@ LoadPCX (VFile *f, int convert, byte *pal)
dataByte = (byte *) &pcx[1]; dataByte = (byte *) &pcx[1];
count = (pcx->xmax + 1) * (pcx->ymax + 1); count = (pcx->xmax + 1) * (pcx->ymax + 1);
if (convert)
count *= 4;
tex = Hunk_TempAlloc (field_offset (tex_t, data[count])); tex = Hunk_TempAlloc (field_offset (tex_t, data[count]));
tex->width = pcx->xmax + 1; tex->width = pcx->xmax + 1;
tex->height = pcx->ymax + 1; tex->height = pcx->ymax + 1;
@ -101,42 +98,35 @@ LoadPCX (VFile *f, int convert, byte *pal)
} }
pix = tex->data; pix = tex->data;
for (y = 0; y < tex->height; y++) { while (count) {
for (x = 0; x < tex->width;) { if (dataByte >= palette)
runLength = 1; break;
if ((*dataByte & 0xC0) == 0xC0) {
runLength = *dataByte++ & 0x3F;
if (dataByte >= palette) if (dataByte >= palette)
break; break;
} else {
if ((*dataByte & 0xC0) == 0xC0) { runLength = 1;
runLength = *dataByte++ & 0x3F;
if (dataByte >= palette)
break;
}
if (convert) {
while (count && runLength > 0) {
*pix++ = palette[*dataByte * 3];
*pix++ = palette[*dataByte * 3 + 1];
*pix++ = palette[*dataByte * 3 + 2];
*pix++ = 255;
count -= 4;
runLength--;
x++;
}
} else {
while (count && runLength > 0) {
*pix++ = *dataByte;
count--;
runLength--;
x++;
}
}
if (runLength)
break;
dataByte++;
} }
if (runLength)
break; if (runLength > count)
runLength = count;
count -= runLength;
if (convert) {
while (runLength-- > 0) {
*pix++ = palette[*dataByte * 3];
*pix++ = palette[*dataByte * 3 + 1];
*pix++ = palette[*dataByte * 3 + 2];
*pix++ = 255;
}
} else {
while (runLength-- > 0) {
*pix++ = *dataByte;
}
}
dataByte++;
} }
Hunk_FreeToLowMark (pcx_mark); Hunk_FreeToLowMark (pcx_mark);
if (count || runLength) { if (count || runLength) {