SWORD25: Started rewriting gfx subsystem

svn-id: r53227

6 files changed, 10 insertions, 10 deletions

diff --git a/engines/sword25/gfx/image/b25sloader.cpp b/engines/sword25/gfx/image/b25sloader.cpp
index e45a4cddcb..9288e2c461 100644
--- a/engines/sword25/gfx/image/b25sloader.cpp
+++ b/engines/sword25/gfx/image/b25sloader.cpp
@@ -85,7 +85,7 @@ bool BS_B25SLoader::IsCorrectImageFormat(const char *FileDataPtr, unsigned int F
 
 // -----------------------------------------------------------------------------
 
-bool BS_B25SLoader::DecodeImage(const char *FileDataPtr, unsigned int FileSize, BS_GraphicEngine::COLOR_FORMATS ColorFormat, char * & UncompressedDataPtr,
+bool BS_B25SLoader::DecodeImage(const char *FileDataPtr, unsigned int FileSize, BS_GraphicEngine::COLOR_FORMATS ColorFormat, byte *&UncompressedDataPtr,
                                 int &Width, int &Height, int &Pitch) {
 	// PNG innerhalb des Spielstandes finden und den Methodenaufruf zu BS_PNGLoader weiterreichen.
 	unsigned int PNGOffset = FindEmbeddedPNG(FileDataPtr, FileSize);
diff --git a/engines/sword25/gfx/image/b25sloader.h b/engines/sword25/gfx/image/b25sloader.h
index 4a2cf3b841..8d8a68e6e8 100644
--- a/engines/sword25/gfx/image/b25sloader.h
+++ b/engines/sword25/gfx/image/b25sloader.h
@@ -58,7 +58,7 @@ public:
 
 protected:
 	virtual bool IsCorrectImageFormat(const char *FileDataPtr, unsigned int FileSize);
-	virtual bool DecodeImage(const char *FileDataPtr, unsigned int FileSize,  BS_GraphicEngine::COLOR_FORMATS ColorFormat, char * & UncompressedDataPtr,
+	virtual bool DecodeImage(const char *FileDataPtr, unsigned int FileSize,  BS_GraphicEngine::COLOR_FORMATS ColorFormat, byte *&UncompressedDataPtr,
 	                         int &Width, int &Height, int &Pitch);
 	virtual bool ImageProperties(const char *FileDataPtr, unsigned int FileSize, BS_GraphicEngine::COLOR_FORMATS &ColorFormat, int &Width, int &Height);
 
diff --git a/engines/sword25/gfx/image/imageloader.cpp b/engines/sword25/gfx/image/imageloader.cpp
index 02eea59f56..f350dba3f8 100644
--- a/engines/sword25/gfx/image/imageloader.cpp
+++ b/engines/sword25/gfx/image/imageloader.cpp
@@ -48,7 +48,7 @@ bool BS_ImageLoader::_ImageLoaderListInitialized = false;
 
 bool BS_ImageLoader::LoadImage(const char *pFileData, unsigned int FileSize,
                                BS_GraphicEngine::COLOR_FORMATS ColorFormat,
-                               char*& pUncompressedData,
+                               byte *&pUncompressedData,
                                int &Width, int &Height,
                                int &Pitch) {
 	// Falls die Liste der BS_ImageLoader noch nicht initialisiert wurde, wird dies getan.
diff --git a/engines/sword25/gfx/image/imageloader.h b/engines/sword25/gfx/image/imageloader.h
index 204a56b144..968ea35af8 100644
--- a/engines/sword25/gfx/image/imageloader.h
+++ b/engines/sword25/gfx/image/imageloader.h
@@ -106,7 +106,7 @@ public:
 	*/
 	static bool LoadImage(const char *pFileData, unsigned int FileSize,
 	                      BS_GraphicEngine::COLOR_FORMATS ColorFormat,
-	                      char*& pUncompressedData,
+	                      byte *&pUncompressedData,
 	                      int &Width, int &Height,
 	                      int &Pitch);
 
@@ -175,7 +175,7 @@ protected:
 	*/
 	virtual bool DecodeImage(const char *pFileData, unsigned int FileSize,
 	                         BS_GraphicEngine::COLOR_FORMATS ColorFormat,
-	                         char*& pUncompressedData,
+	                         byte *&pUncompressedData,
 	                         int &Width, int &Height,
 	                         int &Pitch) = 0;
 
diff --git a/engines/sword25/gfx/image/pngloader.cpp b/engines/sword25/gfx/image/pngloader.cpp
index 3f892c7af1..605dca8635 100644
--- a/engines/sword25/gfx/image/pngloader.cpp
+++ b/engines/sword25/gfx/image/pngloader.cpp
@@ -62,7 +62,7 @@ static void png_user_read_data(png_structp png_ptr, png_bytep data, png_size_t l
 
 // -----------------------------------------------------------------------------
 
-bool BS_PNGLoader::DoDecodeImage(const char *FileDataPtr, unsigned int FileSize,  BS_GraphicEngine::COLOR_FORMATS ColorFormat, char * & UncompressedDataPtr,
+bool BS_PNGLoader::DoDecodeImage(const char *FileDataPtr, unsigned int FileSize,  BS_GraphicEngine::COLOR_FORMATS ColorFormat, byte *&UncompressedDataPtr,
                                  int &Width, int &Height, int &Pitch) {
 	png_structp png_ptr = NULL;
 	png_infop   info_ptr = NULL;
@@ -115,7 +115,7 @@ bool BS_PNGLoader::DoDecodeImage(const char *FileDataPtr, unsigned int FileSize,
 
 	// Speicher für die endgültigen Bilddaten reservieren
 	// Dieses geschieht vor dem reservieren von Speicher für temporäre Bilddaten um die Fragmentierung des Speichers gering zu halten
-	UncompressedDataPtr = new char[Pitch * Height];
+	UncompressedDataPtr = new byte[Pitch * Height];
 	if (!UncompressedDataPtr) {
 		error("Could not allocate memory for output image.");
 	}
@@ -256,7 +256,7 @@ bool BS_PNGLoader::DoDecodeImage(const char *FileDataPtr, unsigned int FileSize,
 
 // -----------------------------------------------------------------------------
 
-bool BS_PNGLoader::DecodeImage(const char *FileDataPtr, unsigned int FileSize,  BS_GraphicEngine::COLOR_FORMATS ColorFormat, char * & UncompressedDataPtr,
+bool BS_PNGLoader::DecodeImage(const char *FileDataPtr, unsigned int FileSize,  BS_GraphicEngine::COLOR_FORMATS ColorFormat, byte *&UncompressedDataPtr,
                                int &Width, int &Height, int &Pitch) {
 	return DoDecodeImage(FileDataPtr, FileSize, ColorFormat, UncompressedDataPtr, Width, Height, Pitch);
 }
diff --git a/engines/sword25/gfx/image/pngloader.h b/engines/sword25/gfx/image/pngloader.h
index 85d12a7a94..17655c6fdc 100644
--- a/engines/sword25/gfx/image/pngloader.h
+++ b/engines/sword25/gfx/image/pngloader.h
@@ -61,7 +61,7 @@ public:
 	// Alle virtuellen Methoden von BS_ImageLoader sind hier als static-Methode implementiert, damit sie von BS_B25SLoader aufgerufen werden können.
 	// Die virtuellen Methoden rufen diese Methoden auf.
 	static bool DoIsCorrectImageFormat(const char *FileDataPtr, unsigned int FileSize);
-	static bool DoDecodeImage(const char *FileDataPtr, unsigned int FileSize,  BS_GraphicEngine::COLOR_FORMATS ColorFormat, char * & UncompressedDataPtr,
+	static bool DoDecodeImage(const char *FileDataPtr, unsigned int FileSize,  BS_GraphicEngine::COLOR_FORMATS ColorFormat, byte *&UncompressedDataPtr,
 	                          int &Width, int &Height, int &Pitch);
 	static bool DoImageProperties(const char *FileDataPtr, unsigned int FileSize, BS_GraphicEngine::COLOR_FORMATS &ColorFormat, int &Width, int &Height);
 
@@ -69,7 +69,7 @@ protected:
 	BS_PNGLoader();
 	bool DecodeImage(const char *pFileData, unsigned int FileSize,
 	                 BS_GraphicEngine::COLOR_FORMATS ColorFormat,
-	                 char * & pUncompressedData,
+	                 byte *&pUncompressedData,
 	                 int &Width, int &Height,
 	                 int &Pitch);
 	bool IsCorrectImageFormat(const char *FileDataPtr, unsigned int FileSize);