From 292f481abcd601b8103c26a11294bbd838fe3a18 Mon Sep 17 00:00:00 2001
From: Tom Hicks <headhunter3@gmail.com>
Date: Sat, 1 Jul 2006 23:49:06 -0400
Subject: [PATCH] Changed Moved LoadTGA into the BitmapImage class ~G2k

---
 src/tga.cpp | 6 +++---
 src/tga.h   | 7 ++++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/tga.cpp b/src/tga.cpp
index 49b7772..8d4d462 100644
--- a/src/tga.cpp
+++ b/src/tga.cpp
@@ -64,7 +64,7 @@ namespace OpenArena{
 		TargaImage(1,1);
 	}
 
-	TextureImage* LoadTGA(const char * filename)
+	TextureImage* TargaImage::LoadTGA(const char * filename)
 	{
 		TargaImage::TGAHeader tgaheader;
 		TextureImage* image;
@@ -109,7 +109,7 @@ namespace OpenArena{
 		return image;
 	}
 
-	TextureImage* LoadUncompressedTGA(FILE * fTGA)
+	TextureImage* TargaImage::LoadUncompressedTGA(FILE * fTGA)
 	{
 		TargaImage::TGA tga;
 		TextureImage* image = new TextureImage;
@@ -195,7 +195,7 @@ namespace OpenArena{
 		return image;
 	}
 
-	TextureImage* LoadCompressedTGA(FILE * fTGA)
+	TextureImage* TargaImage::LoadCompressedTGA(FILE * fTGA)
 	{
 		TextureImage* image = new TextureImage;
 		TargaImage::TGA tga;
diff --git a/src/tga.h b/src/tga.h
index fa5d15a..821fbe1 100644
--- a/src/tga.h
+++ b/src/tga.h
@@ -22,6 +22,8 @@ namespace OpenArena{
 	private:
 		TargaImage();
 		TargaImage(uint32 width, uint32 height, uint32 bpp = 24, Image::Type type = Image::Type_RGB);
+		static TextureImage* LoadUncompressedTGA(FILE *);	// Load an Uncompressed file
+		static TextureImage* LoadCompressedTGA(FILE *);		// Load a Compressed file
 		uint32 _width;
 		uint32 _height;
 		uint32 _bpp;
@@ -52,13 +54,12 @@ namespace OpenArena{
 		virtual Image::Type GetType() const;
 		virtual ~TargaImage(void);
 		static TargaImage* CreateFromFile(const char* filename);
+		static TextureImage* LoadTGA(const char *filename);
+
 	};
 
-	TextureImage* LoadTGA(const char *filename);
 
 	const GLubyte uTGAcompare[12] = {0,0,2, 0,0,0,0,0,0,0,0,0};	// Uncompressed TGA Header
 	const GLubyte cTGAcompare[12] = {0,0,10,0,0,0,0,0,0,0,0,0};	// Compressed TGA Header
-	TextureImage* LoadUncompressedTGA(FILE *);	// Load an Uncompressed file
-	TextureImage* LoadCompressedTGA(FILE *);		// Load a Compressed file
 };
 #endif