Merging r6250 through r6254 from trunk to ogl-es branch
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6255 dfc29bdd-3216-0410-991c-e03cc46cb475
This commit is contained in:
@@ -2,8 +2,8 @@
|
||||
// This file is part of the "Irrlicht Engine".
|
||||
// For conditions of distribution and use, see copyright notice in irrlicht.h
|
||||
|
||||
#ifndef __C_IMAGE_LOADER_TGA_H_INCLUDED__
|
||||
#define __C_IMAGE_LOADER_TGA_H_INCLUDED__
|
||||
#ifndef IRR_C_IMAGE_LOADER_TGA_H_INCLUDED
|
||||
#define IRR_C_IMAGE_LOADER_TGA_H_INCLUDED
|
||||
|
||||
#include "IrrCompileConfig.h"
|
||||
|
||||
@@ -59,13 +59,13 @@ public:
|
||||
|
||||
//! returns true if the file maybe is able to be loaded by this class
|
||||
//! based on the file extension (e.g. ".tga")
|
||||
virtual bool isALoadableFileExtension(const io::path& filename) const _IRR_OVERRIDE_;
|
||||
virtual bool isALoadableFileExtension(const io::path& filename) const IRR_OVERRIDE;
|
||||
|
||||
//! returns true if the file maybe is able to be loaded by this class
|
||||
virtual bool isALoadableFileFormat(io::IReadFile* file) const _IRR_OVERRIDE_;
|
||||
virtual bool isALoadableFileFormat(io::IReadFile* file) const IRR_OVERRIDE;
|
||||
|
||||
//! creates a surface from the file
|
||||
virtual IImage* loadImage(io::IReadFile* file) const _IRR_OVERRIDE_;
|
||||
virtual IImage* loadImage(io::IReadFile* file) const IRR_OVERRIDE;
|
||||
|
||||
private:
|
||||
|
||||
@@ -79,4 +79,3 @@ private:
|
||||
} // end namespace irr
|
||||
|
||||
#endif
|
||||
|
||||
|
Reference in New Issue
Block a user