Large dos2unix commit...

1 files changed, 63 insertions, 63 deletions

diff --git a/include/texture.h b/include/texture.h
index 8bff668..ceaacd1 100644
--- a/include/texture.h
+++ b/include/texture.h
@@ -1,63 +1,63 @@
-/*
- *  mogltk
- *  Copyright (C) 1999-2004 Nicolas "Pixel" Noble
- *
- *  This program 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.
- *
- *  This program 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 this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-/* $Id: texture.h,v 1.7 2004-07-15 14:21:30 pixel Exp $ */
-
-#ifndef __TEXTURE_H__
-#define __TEXTURE_H__
-
-#include <SDL.h>
-#include <SDL_opengl.h>
-#include <Handle.h>
-#include <Exceptions.h>
-#include <generic.h>
-
-namespace mogltk {
-    class texture : public Base {
-      public:
-          texture(int, int, bool = false) throw (GeneralException);
-	  texture(Handle *, bool = false) throw (GeneralException);
-          texture(int, int, int, int);
-	  virtual ~texture();
-	SDL_Surface * GetSurface();
-	Uint32 * GetPixels();
-	SDL_PixelFormat * GetFormat();
-	static SDL_Surface * LoadNTEX(Handle * h) throw (GeneralException) ;
-	void Generate();
-	void Bind(bool = true);
-	GLuint GetWidth();
-	GLuint GetHeight();
-	static void Unbind(void);
-	void Taint(void);
-        static void Taintall(void);
-        void DumpBMP(const String &);
-      private:
-        GLuint width, height, tex;
-	bool texture_allocated;
-	SDL_Surface * surface;
-	bool planar, tainted, taintable;
-	static texture * header;
-	static texture * footer;
-	texture * next, * prev;
-	static texture * active;
-        void recTaint(void);
-    };
-};
-
-#endif
+/*

+ *  mogltk

+ *  Copyright (C) 1999-2004 Nicolas "Pixel" Noble

+ *

+ *  This program 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.

+ *

+ *  This program 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 this program; if not, write to the Free Software

+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+ */

+

+/* $Id: texture.h,v 1.8 2004-11-27 21:44:50 pixel Exp $ */

+

+#ifndef __TEXTURE_H__

+#define __TEXTURE_H__

+

+#include <SDL.h>

+#include <SDL_opengl.h>

+#include <Handle.h>

+#include <Exceptions.h>

+#include <generic.h>

+

+namespace mogltk {

+    class texture : public Base {

+      public:

+          texture(int, int, bool = false) throw (GeneralException);

+	  texture(Handle *, bool = false) throw (GeneralException);

+          texture(int, int, int, int);

+	  virtual ~texture();

+	SDL_Surface * GetSurface();

+	Uint32 * GetPixels();

+	SDL_PixelFormat * GetFormat();

+	static SDL_Surface * LoadNTEX(Handle * h) throw (GeneralException) ;

+	void Generate();

+	void Bind(bool = true);

+	GLuint GetWidth();

+	GLuint GetHeight();

+	static void Unbind(void);

+	void Taint(void);

+        static void Taintall(void);

+        void DumpBMP(const String &);

+      private:

+        GLuint width, height, tex;

+	bool texture_allocated;

+	SDL_Surface * surface;

+	bool planar, tainted, taintable;

+	static texture * header;

+	static texture * footer;

+	texture * next, * prev;

+	static texture * active;

+        void recTaint(void);

+    };

+};

+

+#endif