Cronocide/Descent3
1
0
Fork 0
mirror of https://github.com/kevinbentley/Descent3.git synced 2025-01-22 11:28:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #481 from MaddTheSane/iffSafe

Browse Source 
Fix endian issues with iff importer.
This commit is contained in:
Azamat H. Hackimov 2024-07-03 12:22:05 +03:00 committed by GitHub
commit 4c574bf198
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 15 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
bitmap/iff.cpp
View File

@ -176,27 +176,22 @@ int bm_iff_get_sig(CFILE *f) {
int bm_iff_parse_bmhd(CFILE *ifile, uint32_t len, iff_bitmap_header *bmheader) {
len = len;
bmheader->w = cf_ReadShort(ifile);
bmheader->w = MOTOROLA_SHORT(bmheader->w);
bmheader->h = cf_ReadShort(ifile);
bmheader->h = MOTOROLA_SHORT(bmheader->h);
bmheader->x = cf_ReadShort(ifile);
bmheader->x = MOTOROLA_SHORT(bmheader->x);
bmheader->y = cf_ReadShort(ifile);
bmheader->y = MOTOROLA_SHORT(bmheader->y);
bmheader->w = cf_ReadShort(ifile, false);
bmheader->h = cf_ReadShort(ifile, false);
bmheader->x = cf_ReadShort(ifile, false);
bmheader->y = cf_ReadShort(ifile, false);
bmheader->nplanes = cf_ReadByte(ifile);
bmheader->masking = cf_ReadByte(ifile);
bmheader->compression = cf_ReadByte(ifile);
cf_ReadByte(ifile); /* skip pad */
bmheader->transparentcolor = cf_ReadShort(ifile);
bmheader->transparentcolor = MOTOROLA_SHORT(bmheader->transparentcolor);
bmheader->transparentcolor = cf_ReadShort(ifile, false);
bmheader->xaspect = cf_ReadByte(ifile);
bmheader->yaspect = cf_ReadByte(ifile);
bmheader->pagewidth = cf_ReadShort(ifile);
bmheader->pageheight = cf_ReadShort(ifile);
bmheader->pagewidth = cf_ReadShort(ifile, false);
bmheader->pageheight = cf_ReadShort(ifile, false);
iff_transparent_color = bmheader->transparentcolor;
@ -383,8 +378,7 @@ int bm_iff_parse_file(CFILE *ifile, iff_bitmap_header *bmheader, iff_bitmap_head
sig = bm_iff_get_sig(ifile);
len = cf_ReadInt(ifile);
len = MOTOROLA_INT(len);
len = cf_ReadInt(ifile, false);
switch (sig) {
case IFF_SIG_FORM: {
@ -568,7 +562,7 @@ int bm_iff_read_animbrush(const char *ifilename, int *bm_list) {
return -1;
sig = bm_iff_get_sig(ifile);
form_len = cf_ReadInt(ifile);
form_len = cf_ReadInt(ifile, false);
if (sig != IFF_SIG_FORM) {
mprintf(0, "Not a valid IFF file.\n");

8
cfile/cfile.cpp
View File

@ -909,17 +909,17 @@ int cf_ReadBytes(uint8_t *buf, int count, CFILE *cfp) {
// to be present.
// Read and return an integer (32 bits)
// Throws an exception of type (cfile_error *) if the OS returns an error on read
int32_t cf_ReadInt(CFILE *cfp) {
int32_t cf_ReadInt(CFILE *cfp, bool little_endian) {
int32_t i;
cf_ReadBytes((uint8_t *)&i, sizeof(i), cfp);
return INTEL_INT(i);
return little_endian ? D3::convert_le(i) : D3::convert_be(i);
}
// Read and return a int16_t (16 bits)
// Throws an exception of type (cfile_error *) if the OS returns an error on read
int16_t cf_ReadShort(CFILE *cfp) {
int16_t cf_ReadShort(CFILE *cfp, bool little_endian) {
int16_t i;
cf_ReadBytes((uint8_t *)&i, sizeof(i), cfp);
return INTEL_SHORT(i);
return little_endian ? D3::convert_le(i) : D3::convert_be(i);
}
// Read and return a byte (8 bits)
// Throws an exception of type (cfile_error *) if the OS returns an error on read

4
cfile/cfile.h
View File

@ -227,11 +227,11 @@ int cf_ReadBytes(uint8_t *buf, int count, CFILE *cfp);
// Read and return an integer (32 bits)
// Throws an exception of type (cfile_error *) if the OS returns an error on read
int32_t cf_ReadInt(CFILE *cfp);
int32_t cf_ReadInt(CFILE *cfp, bool little_endian = true);
// Read and return a int16_t (16 bits)
// Throws an exception of type (cfile_error *) if the OS returns an error on read
int16_t cf_ReadShort(CFILE *cfp);
int16_t cf_ReadShort(CFILE *cfp, bool little_endian = true);
// Read and return a byte (8 bits)
// Throws an exception of type (cfile_error *) if the OS returns an error on read