First step at cleaning image loading.

[lugaru.git] / Source / TGALoader.h

diff --git a/Source/TGALoader.h b/Source/TGALoader.h
index 62e90b05f1daaa7314afed5c0f85578e7c12f80e..d8f333635a9cd380749a8284c22243f5cdca4212 100644 (file)
--- a/Source/TGALoader.h
+++ b/Source/TGALoader.h
@@ -1,5 +1,24 @@
-#ifndef        _TGA_LOADER_H_
-#define        _TGA_LOADER_H_
+/*
+Copyright (C) 2003, 2010 - Wolfire Games
+
+This file is part of Lugaru.
+
+Lugaru is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+Lugaru is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with Lugaru.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef _TGA_LOADER_H_
+#define _TGA_LOADER_H_
 
 #ifdef _MSC_VER
 #pragma once
@@ -15,29 +34,20 @@
 #define Polygon WinPolygon
 #include <windows.h>
 #undef Polygon
-#include <gl/gl.h>
+#include "GL/gl.h"
 #else
 #include "gamegl.h"
-//     #include "MoreFilesX.h"
 #endif
 
-//#include <stdbool.h>
-//#include <QuickTime.h>
-
 /**> DATA STRUCTURES <**/
-typedef struct TGAImageRec
-{
-       GLubyte *data;          // Image Data (Up To 32 Bits)
-       GLuint  bpp;            // Image Color Depth In Bits Per Pixel.
-       GLuint  sizeX;
-       GLuint  sizeY;
-}      TGAImageRec;
-
-bool upload_image(const unsigned char* filePath, bool hasalpha);
-
-/**> FUNCTION PROTOTYPES <**/
-TGAImageRec*   LoadTGA( char *filename );
-
+typedef struct ImageRec {
+    GLubyte *data; // Image Data (Up To 32 Bits)
+    GLuint bpp; // Image Color Depth In Bits Per Pixel.
+    GLuint sizeX;
+    GLuint sizeY;
+} ImageRec;
+
+bool upload_image(const char* filePath);
 
 #endif