qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-26 14:20:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

QFimage: Don't use qfs_filesize when loading images

Browse source 
Use Qfilesize() to get the size of a read file, don't count on quakefs's
global qfs_filesize variable pointing at the right file.
This commit is contained in:
Jeff Teunissen 2011-01-09 00:55:40 -05:00
parent fbdbcfada4
commit e819ea3b7f
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
libs/image/pcx.c
View file

@ -60,11 +60,12 @@ LoadPCX (QFile *f, int convert, byte *pal)
int runLength = 1;
int count;
tex_t *tex;
int fsize = Qfilesize(f);
// parse the PCX file
pcx_mark = Hunk_LowMark ();
pcx = Hunk_AllocName (qfs_filesize, "PCX");
Qread (f, pcx, qfs_filesize);
pcx = Hunk_AllocName (fsize, "PCX");
Qread (f, pcx, fsize);
pcx->xmax = LittleShort (pcx->xmax);
pcx->xmin = LittleShort (pcx->xmin);
@ -83,7 +84,7 @@ LoadPCX (QFile *f, int convert, byte *pal)
return 0;
}
palette = ((byte *) pcx) + qfs_filesize - 768;
palette = ((byte *) pcx) + fsize - 768;
dataByte = (byte *) &pcx[1];
count = (pcx->xmax + 1) * (pcx->ymax + 1);
@ -144,9 +145,9 @@ VISIBLE pcx_t *
EncodePCX (byte * data, int width, int height,
int rowbytes, byte * palette, qboolean flip, int *length)
{
int i, j, size;
int i, run, pix, size;
pcx_t *pcx;
byte *pack;
byte *pack, *dataend;
size = width * height * 2 + 1000;
if (!(pcx = Hunk_TempAlloc (size))) {

7
libs/image/tga.c
View file

@ -627,13 +627,14 @@ LoadTGA (QFile *fin)
{
byte *dataByte;
decoder_t decode;
int numPixels, targa_mark;
int fsize = Qfilesize (fin);
int numPixels, targa_mark;
TargaHeader *targa;
tex_t *tex;
targa_mark = Hunk_LowMark ();
targa = Hunk_AllocName (qfs_filesize, "TGA");
Qread (fin, targa, qfs_filesize);
targa = Hunk_AllocName (fsize, "TGA");
Qread (fin, targa, fsize);
targa->colormap_index = LittleShort (targa->colormap_index);
targa->colormap_length = LittleShort (targa->colormap_length);