From 65d14730da6e394967d1577f17863e21479d2378 Mon Sep 17 00:00:00 2001
From: aap <aap@papnet.eu>
Date: Thu, 16 Jul 2020 11:35:41 +0200
Subject: [PATCH] fixed tex reading bug

---
 src/base.cpp | 2 +-
 src/bmp.cpp  | 7 +------
 src/rwbase.h | 2 +-
 src/tga.cpp  | 7 +------
 4 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/src/base.cpp b/src/base.cpp
index 2179c67..a239b63 100644
--- a/src/base.cpp
+++ b/src/base.cpp
@@ -1102,7 +1102,7 @@ findPointer(void *p, void **list, int32 num)
 }
 
 uint8*
-getFileContents(char *name, uint32 *len)
+getFileContents(const char *name, uint32 *len)
 {
 	FILE *cf = fopen(name, "rb");
 	assert(cf != nil);
diff --git a/src/bmp.cpp b/src/bmp.cpp
index 98e9846..7683133 100644
--- a/src/bmp.cpp
+++ b/src/bmp.cpp
@@ -73,11 +73,10 @@ BMPheader::write(Stream *stream)
 }
 
 Image*
-readBMP(const char *afilename)
+readBMP(const char *filename)
 {
 	ASSERTLITTLE;
 	Image *image;
-	char *filename;
 	uint32 length;
 	uint8 *data;
 	StreamMemory file;
@@ -86,11 +85,7 @@ readBMP(const char *afilename)
 	bool32 noalpha;
 	int pad;
 
-	filename = Image::getFilename(afilename);
-	if(filename == nil)
-		return nil;
 	data = getFileContents(filename, &length);
-	rwFree(filename);
 	if(data == nil)
 		return nil;
 	file.open(data, length);
diff --git a/src/rwbase.h b/src/rwbase.h
index 56bf960..d9cec4b 100644
--- a/src/rwbase.h
+++ b/src/rwbase.h
@@ -695,5 +695,5 @@ bool readChunkHeaderInfo(Stream *s, ChunkHeaderInfo *header);
 bool findChunk(Stream *s, uint32 type, uint32 *length, uint32 *version);
 
 int32 findPointer(void *p, void **list, int32 num);
-uint8 *getFileContents(char *name, uint32 *len);
+uint8 *getFileContents(const char *name, uint32 *len);
 }
diff --git a/src/tga.cpp b/src/tga.cpp
index f24ab7c..9d761d1 100644
--- a/src/tga.cpp
+++ b/src/tga.cpp
@@ -73,19 +73,14 @@ TGAHeader::write(Stream *stream)
 }
 
 Image*
-readTGA(const char *afilename)
+readTGA(const char *filename)
 {
 	TGAHeader header;
 	Image *image;
-	char *filename;
 	int depth = 0, palDepth = 0;
-	filename = Image::getFilename(afilename);
-	if(filename == nil)
-		return nil;
 	uint32 length;
 	uint8 *data = getFileContents(filename, &length);
 	assert(data != nil);
-	rwFree(filename);
 	StreamMemory file;
 	file.open(data, length);
 	header.read(&file);