From 959831f4ef5a3e797f576c3de08cd65032c997ad Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Sun, 13 Jan 2013 18:54:10 +1000
Subject: Remove damned ancient DOS line endings from Irrlicht.  Hopefully I
 did not go overboard.

---
 .../tools/IrrFontTool/newFontTool/CFontTool.h      | 156 ++++++++++-----------
 1 file changed, 78 insertions(+), 78 deletions(-)

(limited to 'libraries/irrlicht-1.8/tools/IrrFontTool/newFontTool/CFontTool.h')

diff --git a/libraries/irrlicht-1.8/tools/IrrFontTool/newFontTool/CFontTool.h b/libraries/irrlicht-1.8/tools/IrrFontTool/newFontTool/CFontTool.h
index 5a35938..ee0eefb 100644
--- a/libraries/irrlicht-1.8/tools/IrrFontTool/newFontTool/CFontTool.h
+++ b/libraries/irrlicht-1.8/tools/IrrFontTool/newFontTool/CFontTool.h
@@ -1,78 +1,78 @@
-#ifndef __IRR_FONT_TOOL_INCLUDED__
-#define __IRR_FONT_TOOL_INCLUDED__
-
-
-#include "irrlicht.h"
-
-#if defined(_IRR_WINDOWS_)
-	#ifdef _MBCS
-		#undef _MBCS
-	#endif
-
-	#define UNICODE
-	#define _WIN32_WINNT 0x0500	
-	#include "windows.h"
-#else
-	#ifdef _IRR_COMPILE_WITH_X11_
-	#include <X11/Xlib.h>
-	#endif
-	#include <X11/Xft/Xft.h>
-	#include <set>
-#endif
-
-
-namespace irr {
-	class CFontTool : public irr::IReferenceCounted
-	{
-	public:
-		CFontTool(irr::IrrlichtDevice* device);
-		~CFontTool();
-
-		virtual bool makeBitmapFont(u32 fontIndex, u32 charsetIndex, 
-				s32 fontSize, u32 texturewidth, u32 textureHeight,
-				bool bold, bool italic, bool aa, bool alpha);
-
-		virtual bool saveBitmapFont(const c8* filename, const c8* format);
-
-		virtual void selectCharSet(u32 currentCharSet);
-
-		struct SFontArea
-		{
-			SFontArea() : rectangle(), underhang(0), overhang(0), sourceimage(0) {}
-			core::rect<s32> rectangle;
-			s32		underhang;
-			s32		overhang;
-			u32		sourceimage;
-		};
-
-	/*	struct SFontMap
-		{
-			SFontMap() :  areas(), start(0), count(0) {}
-			core::array< SFontArea >	areas;
-			s32				start;
-			s32				count;
-		};*/
-
-
-
-		core::array<core::stringw>	FontNames;
-		core::array<core::stringw>	CharSets;
-		//core::array<SFontMap>		Mappings;
-		core::array<SFontArea>		Areas;
-		core::map<wchar_t, u32>		CharMap;
-
-		core::array<video::ITexture*>	currentTextures;
-		core::array<video::IImage*>	currentImages;
-		const int			*FontSizes;
-		IrrlichtDevice			*Device;
-
-		bool UseAlphaChannel;
-
-		// windows
-		#ifdef _IRR_WINDOWS_
-		HDC dc;
-		#endif
-
-	};
-}
-#endif // __IRR_FONT_TOOL_INCLUDED__
+#ifndef __IRR_FONT_TOOL_INCLUDED__
+#define __IRR_FONT_TOOL_INCLUDED__
+
+
+#include "irrlicht.h"
+
+#if defined(_IRR_WINDOWS_)
+	#ifdef _MBCS
+		#undef _MBCS
+	#endif
+
+	#define UNICODE
+	#define _WIN32_WINNT 0x0500	
+	#include "windows.h"
+#else
+	#ifdef _IRR_COMPILE_WITH_X11_
+	#include <X11/Xlib.h>
+	#endif
+	#include <X11/Xft/Xft.h>
+	#include <set>
+#endif
+
+
+namespace irr {
+	class CFontTool : public irr::IReferenceCounted
+	{
+	public:
+		CFontTool(irr::IrrlichtDevice* device);
+		~CFontTool();
+
+		virtual bool makeBitmapFont(u32 fontIndex, u32 charsetIndex, 
+				s32 fontSize, u32 texturewidth, u32 textureHeight,
+				bool bold, bool italic, bool aa, bool alpha);
+
+		virtual bool saveBitmapFont(const c8* filename, const c8* format);
+
+		virtual void selectCharSet(u32 currentCharSet);
+
+		struct SFontArea
+		{
+			SFontArea() : rectangle(), underhang(0), overhang(0), sourceimage(0) {}
+			core::rect<s32> rectangle;
+			s32		underhang;
+			s32		overhang;
+			u32		sourceimage;
+		};
+
+	/*	struct SFontMap
+		{
+			SFontMap() :  areas(), start(0), count(0) {}
+			core::array< SFontArea >	areas;
+			s32				start;
+			s32				count;
+		};*/
+
+
+
+		core::array<core::stringw>	FontNames;
+		core::array<core::stringw>	CharSets;
+		//core::array<SFontMap>		Mappings;
+		core::array<SFontArea>		Areas;
+		core::map<wchar_t, u32>		CharMap;
+
+		core::array<video::ITexture*>	currentTextures;
+		core::array<video::IImage*>	currentImages;
+		const int			*FontSizes;
+		IrrlichtDevice			*Device;
+
+		bool UseAlphaChannel;
+
+		// windows
+		#ifdef _IRR_WINDOWS_
+		HDC dc;
+		#endif
+
+	};
+}
+#endif // __IRR_FONT_TOOL_INCLUDED__
-- 
cgit v1.1