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. --- libraries/irrlicht-1.8/source/Irrlicht/irrXML.cpp | 360 +++++++++++----------- 1 file changed, 180 insertions(+), 180 deletions(-) (limited to 'libraries/irrlicht-1.8/source/Irrlicht/irrXML.cpp') diff --git a/libraries/irrlicht-1.8/source/Irrlicht/irrXML.cpp b/libraries/irrlicht-1.8/source/Irrlicht/irrXML.cpp index 9197348..06f87d7 100644 --- a/libraries/irrlicht-1.8/source/Irrlicht/irrXML.cpp +++ b/libraries/irrlicht-1.8/source/Irrlicht/irrXML.cpp @@ -1,180 +1,180 @@ -// Copyright (C) 2002-2012 Nikolaus Gebhardt -// This file is part of the "Irrlicht Engine" and the "irrXML" project. -// For conditions of distribution and use, see copyright notice in irrlicht.h and/or irrXML.h - -#include "irrXML.h" -#include "irrString.h" -#include "irrArray.h" -#include "fast_atof.h" -#include "CXMLReaderImpl.h" - -namespace irr -{ -namespace io -{ - -//! Implementation of the file read callback for ordinary files -class CFileReadCallBack : public IFileReadCallBack -{ -public: - - //! construct from filename - CFileReadCallBack(const char* filename) - : File(0), Size(-1), Close(true) - { - // open file - File = fopen(filename, "rb"); - - if (File) - getFileSize(); - } - - //! construct from FILE pointer - CFileReadCallBack(FILE* file) - : File(file), Size(-1), Close(false) - { - if (File) - getFileSize(); - } - - //! destructor - virtual ~CFileReadCallBack() - { - if (Close && File) - fclose(File); - } - - //! Reads an amount of bytes from the file. - virtual int read(void* buffer, int sizeToRead) - { - if (!File) - return 0; - - return (int)fread(buffer, 1, sizeToRead, File); - } - - //! Returns size of file in bytes - virtual long getSize() const - { - return Size; - } - -private: - - //! retrieves the file size of the open file - void getFileSize() - { - fseek(File, 0, SEEK_END); - Size = ftell(File); - fseek(File, 0, SEEK_SET); - } - - FILE* File; - long Size; - bool Close; - -}; // end class CFileReadCallBack - - - -// FACTORY FUNCTIONS: - - -//! Creates an instance of an UFT-8 or ASCII character xml parser. -IRRLICHT_API IrrXMLReader* IRRCALLCONV createIrrXMLReader(const char* filename) -{ - return createIrrXMLReader(new CFileReadCallBack(filename), true); -} - - -//! Creates an instance of an UFT-8 or ASCII character xml parser. -IRRLICHT_API IrrXMLReader* IRRCALLCONV createIrrXMLReader(FILE* file) -{ - return createIrrXMLReader(new CFileReadCallBack(file), true); -} - - -//! Creates an instance of an UFT-8 or ASCII character xml parser. -IRRLICHT_API IrrXMLReader* IRRCALLCONV createIrrXMLReader(IFileReadCallBack* callback, - bool deleteCallback) -{ - if (callback && (callback->getSize() >= 0)) - { - return new CXMLReaderImpl(callback, deleteCallback); - } - else - { - if(callback && deleteCallback) - delete callback; - - return 0; - } -} - - -//! Creates an instance of an UTF-16 xml parser. -IRRLICHT_API IrrXMLReaderUTF16* IRRCALLCONV createIrrXMLReaderUTF16(const char* filename) -{ - return createIrrXMLReaderUTF16(new CFileReadCallBack(filename), true); -} - - -//! Creates an instance of an UTF-16 xml parser. -IRRLICHT_API IrrXMLReaderUTF16* IRRCALLCONV createIrrXMLReaderUTF16(FILE* file) -{ - return createIrrXMLReaderUTF16(new CFileReadCallBack(file), true); -} - - -//! Creates an instance of an UTF-16 xml parser. -IRRLICHT_API IrrXMLReaderUTF16* IRRCALLCONV createIrrXMLReaderUTF16(IFileReadCallBack* callback, - bool deleteCallback) -{ - if (callback && (callback->getSize() >= 0)) - { - return new CXMLReaderImpl(callback, deleteCallback); - } - else - { - if(callback && deleteCallback) - delete callback; - - return 0; - } -} - - -//! Creates an instance of an UTF-32 xml parser. -IRRLICHT_API IrrXMLReaderUTF32* IRRCALLCONV createIrrXMLReaderUTF32(const char* filename) -{ - return createIrrXMLReaderUTF32(new CFileReadCallBack(filename), true); -} - - -//! Creates an instance of an UTF-32 xml parser. -IRRLICHT_API IrrXMLReaderUTF32* IRRCALLCONV createIrrXMLReaderUTF32(FILE* file) -{ - return createIrrXMLReaderUTF32(new CFileReadCallBack(file), true); -} - - -//! Creates an instance of an UTF-32 xml parser. -IRRLICHT_API IrrXMLReaderUTF32* IRRCALLCONV createIrrXMLReaderUTF32( - IFileReadCallBack* callback, bool deleteCallback) -{ - if (callback && (callback->getSize() >= 0)) - { - return new CXMLReaderImpl(callback, deleteCallback); - } - else - { - if(callback && deleteCallback) - delete callback; - - return 0; - } -} - - -} // end namespace io -} // end namespace irr +// Copyright (C) 2002-2012 Nikolaus Gebhardt +// This file is part of the "Irrlicht Engine" and the "irrXML" project. +// For conditions of distribution and use, see copyright notice in irrlicht.h and/or irrXML.h + +#include "irrXML.h" +#include "irrString.h" +#include "irrArray.h" +#include "fast_atof.h" +#include "CXMLReaderImpl.h" + +namespace irr +{ +namespace io +{ + +//! Implementation of the file read callback for ordinary files +class CFileReadCallBack : public IFileReadCallBack +{ +public: + + //! construct from filename + CFileReadCallBack(const char* filename) + : File(0), Size(-1), Close(true) + { + // open file + File = fopen(filename, "rb"); + + if (File) + getFileSize(); + } + + //! construct from FILE pointer + CFileReadCallBack(FILE* file) + : File(file), Size(-1), Close(false) + { + if (File) + getFileSize(); + } + + //! destructor + virtual ~CFileReadCallBack() + { + if (Close && File) + fclose(File); + } + + //! Reads an amount of bytes from the file. + virtual int read(void* buffer, int sizeToRead) + { + if (!File) + return 0; + + return (int)fread(buffer, 1, sizeToRead, File); + } + + //! Returns size of file in bytes + virtual long getSize() const + { + return Size; + } + +private: + + //! retrieves the file size of the open file + void getFileSize() + { + fseek(File, 0, SEEK_END); + Size = ftell(File); + fseek(File, 0, SEEK_SET); + } + + FILE* File; + long Size; + bool Close; + +}; // end class CFileReadCallBack + + + +// FACTORY FUNCTIONS: + + +//! Creates an instance of an UFT-8 or ASCII character xml parser. +IRRLICHT_API IrrXMLReader* IRRCALLCONV createIrrXMLReader(const char* filename) +{ + return createIrrXMLReader(new CFileReadCallBack(filename), true); +} + + +//! Creates an instance of an UFT-8 or ASCII character xml parser. +IRRLICHT_API IrrXMLReader* IRRCALLCONV createIrrXMLReader(FILE* file) +{ + return createIrrXMLReader(new CFileReadCallBack(file), true); +} + + +//! Creates an instance of an UFT-8 or ASCII character xml parser. +IRRLICHT_API IrrXMLReader* IRRCALLCONV createIrrXMLReader(IFileReadCallBack* callback, + bool deleteCallback) +{ + if (callback && (callback->getSize() >= 0)) + { + return new CXMLReaderImpl(callback, deleteCallback); + } + else + { + if(callback && deleteCallback) + delete callback; + + return 0; + } +} + + +//! Creates an instance of an UTF-16 xml parser. +IRRLICHT_API IrrXMLReaderUTF16* IRRCALLCONV createIrrXMLReaderUTF16(const char* filename) +{ + return createIrrXMLReaderUTF16(new CFileReadCallBack(filename), true); +} + + +//! Creates an instance of an UTF-16 xml parser. +IRRLICHT_API IrrXMLReaderUTF16* IRRCALLCONV createIrrXMLReaderUTF16(FILE* file) +{ + return createIrrXMLReaderUTF16(new CFileReadCallBack(file), true); +} + + +//! Creates an instance of an UTF-16 xml parser. +IRRLICHT_API IrrXMLReaderUTF16* IRRCALLCONV createIrrXMLReaderUTF16(IFileReadCallBack* callback, + bool deleteCallback) +{ + if (callback && (callback->getSize() >= 0)) + { + return new CXMLReaderImpl(callback, deleteCallback); + } + else + { + if(callback && deleteCallback) + delete callback; + + return 0; + } +} + + +//! Creates an instance of an UTF-32 xml parser. +IRRLICHT_API IrrXMLReaderUTF32* IRRCALLCONV createIrrXMLReaderUTF32(const char* filename) +{ + return createIrrXMLReaderUTF32(new CFileReadCallBack(filename), true); +} + + +//! Creates an instance of an UTF-32 xml parser. +IRRLICHT_API IrrXMLReaderUTF32* IRRCALLCONV createIrrXMLReaderUTF32(FILE* file) +{ + return createIrrXMLReaderUTF32(new CFileReadCallBack(file), true); +} + + +//! Creates an instance of an UTF-32 xml parser. +IRRLICHT_API IrrXMLReaderUTF32* IRRCALLCONV createIrrXMLReaderUTF32( + IFileReadCallBack* callback, bool deleteCallback) +{ + if (callback && (callback->getSize() >= 0)) + { + return new CXMLReaderImpl(callback, deleteCallback); + } + else + { + if(callback && deleteCallback) + delete callback; + + return 0; + } +} + + +} // end namespace io +} // end namespace irr -- cgit v1.1