random-mirrors
/
librw
mirror of https://github.com/aap/librw.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed tex reading bug

This commit is contained in:
aap 2020-07-16 11:35:41 +02:00
parent 990a7e21dd
commit 65d14730da
4 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/base.cpp
View File

@ -1102,7 +1102,7 @@ findPointer(void *p, void **list, int32 num)
} }
uint8* uint8*
getFileContents(char *name, uint32 *len) getFileContents(const char *name, uint32 *len)
{ {
FILE *cf = fopen(name, "rb"); FILE *cf = fopen(name, "rb");
assert(cf != nil); assert(cf != nil);

7
src/bmp.cpp
View File

@ -73,11 +73,10 @@ BMPheader::write(Stream *stream)
} }
Image* Image*
readBMP(const char *afilename) readBMP(const char *filename)
{ {
ASSERTLITTLE; ASSERTLITTLE;
Image *image; Image *image;
char *filename;
uint32 length; uint32 length;
uint8 *data; uint8 *data;
StreamMemory file; StreamMemory file;
@ -86,11 +85,7 @@ readBMP(const char *afilename)
bool32 noalpha; bool32 noalpha;
int pad; int pad;
filename = Image::getFilename(afilename);
if(filename == nil)
return nil;
data = getFileContents(filename, &length); data = getFileContents(filename, &length);
rwFree(filename);
if(data == nil) if(data == nil)
return nil; return nil;
file.open(data, length); file.open(data, length);

2
src/rwbase.h
View File

@ -695,5 +695,5 @@ bool readChunkHeaderInfo(Stream *s, ChunkHeaderInfo *header);
bool findChunk(Stream *s, uint32 type, uint32 *length, uint32 *version); bool findChunk(Stream *s, uint32 type, uint32 *length, uint32 *version);
int32 findPointer(void *p, void **list, int32 num); int32 findPointer(void *p, void **list, int32 num);
uint8 *getFileContents(char *name, uint32 *len); uint8 *getFileContents(const char *name, uint32 *len);
} }

7
src/tga.cpp
View File

@ -73,19 +73,14 @@ TGAHeader::write(Stream *stream)
} }
Image* Image*
readTGA(const char *afilename) readTGA(const char *filename)
{ {
TGAHeader header; TGAHeader header;
Image *image; Image *image;
char *filename;
int depth = 0, palDepth = 0; int depth = 0, palDepth = 0;
filename = Image::getFilename(afilename);
if(filename == nil)
return nil;
uint32 length; uint32 length;
uint8 *data = getFileContents(filename, &length); uint8 *data = getFileContents(filename, &length);
assert(data != nil); assert(data != nil);
rwFree(filename);
StreamMemory file; StreamMemory file;
file.open(data, length); file.open(data, length);
header.read(&file); header.read(&file);