qf/newtree
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/newtree synced 2024-11-22 12:11:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix PCX loading on big-endian systems

Browse source
This commit is contained in:
Jeff Teunissen 2000-12-01 08:59:44 +00:00
parent 778fa713a6
commit 7b82e44ca1
3 changed files with 36 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/pcx.h
View file

@ -35,8 +35,8 @@ typedef struct
char version;
char encoding;
char bits_per_pixel;
unsigned short xmin,ymin,xmax,ymax;
unsigned short hres,vres;
unsigned short xmin, ymin, xmax, ymax;
unsigned short hres, vres;
unsigned char palette[48];
char reserved;
char color_planes;

38
source/pcx.c
View file

@ -32,6 +32,7 @@
#include "console.h"
#include "pcx.h"
#include "qendian.h"
#include "qtypes.h"
#include "quakefs.h"
@ -52,10 +53,19 @@ void LoadPCX (QFile *f)
//
// parse the PCX file
//
Qread (f, &pcxbuf, sizeof(pcxbuf));
Qread (f, &pcxbuf, sizeof (pcxbuf));
pcx = &pcxbuf;
pcx->xmax = LittleShort (pcx->xmax);
pcx->xmin = LittleShort (pcx->xmin);
pcx->ymax = LittleShort (pcx->ymax);
pcx->ymin = LittleShort (pcx->ymin);
pcx->hres = LittleShort (pcx->hres);
pcx->vres = LittleShort (pcx->vres);
pcx->bytes_per_line = LittleShort (pcx->bytes_per_line);
pcx->palette_type = LittleShort (pcx->palette_type);
if (pcx->manufacturer != 0x0a
|| pcx->version != 5
|| pcx->encoding != 1
@ -70,27 +80,27 @@ void LoadPCX (QFile *f)
Qseek (f, -768, SEEK_END);
Qread (f, palette, 768);
Qseek (f, sizeof(pcxbuf) - 4, SEEK_SET);
Qseek (f, sizeof (pcxbuf) - 4, SEEK_SET);
count = (pcx->xmax+1) * (pcx->ymax+1);
pcx_rgb = malloc( count * 4);
count = (pcx->xmax + 1) * (pcx->ymax + 1);
pcx_rgb = malloc (count * 4);
for (y=0 ; y<=pcx->ymax ; y++) {
for (y = 0; y <= pcx->ymax; y++) {
pix = pcx_rgb + 4*y*(pcx->xmax+1);
for (x=0 ; x<=pcx->ymax ; ) {
dataByte = Qgetc(f);
for (x = 0; x <= pcx->ymax;) {
dataByte = Qgetc (f);
if((dataByte & 0xC0) == 0xC0) {
runLength = dataByte & 0x3F;
dataByte = Qgetc(f);
}
else
dataByte = Qgetc (f);
} else {
runLength = 1;
}
while(runLength-- > 0) {
pix[0] = palette[dataByte*3];
pix[1] = palette[dataByte*3+1];
pix[2] = palette[dataByte*3+2];
while (runLength-- > 0) {
pix[0] = palette[dataByte * 3];
pix[1] = palette[dataByte * 3 + 1];
pix[2] = palette[dataByte * 3 + 2];
pix[3] = 255;
pix += 4;
x++;

10
source/skin.c
View file

@ -38,6 +38,7 @@
#include "msg.h"
#include "pcx.h"
#include "sys.h"
#include "qendian.h"
#include "va.h"
#include "skin.h"
#include "cl_parse.h"
@ -159,6 +160,15 @@ byte *Skin_Cache (skin_t *skin)
pcx = (pcx_t *)raw;
raw = &pcx->data;
pcx->xmax = LittleShort (pcx->xmax);
pcx->xmin = LittleShort (pcx->xmin);
pcx->ymax = LittleShort (pcx->ymax);
pcx->ymin = LittleShort (pcx->ymin);
pcx->hres = LittleShort (pcx->hres);
pcx->vres = LittleShort (pcx->vres);
pcx->bytes_per_line = LittleShort (pcx->bytes_per_line);
pcx->palette_type = LittleShort (pcx->palette_type);
if (pcx->manufacturer != 0x0a
|| pcx->version != 5
|| pcx->encoding != 1