luanti-org/irrlicht-archive
Archived
1
0
Fork 0
Code Activity

Merging r6250 through r6254 from trunk to ogl-es branch

Browse Source 
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:
cutealien
2021-08-27 19:14:39 +00:00
parent 21302d038a
commit ee3579015b
275 changed files with 4166 additions and 3846 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/Irrlicht/CImageLoaderPVR.h
View File

@@ -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_PVR_H_INCLUDED__
#define __C_IMAGE_LOADER_PVR_H_INCLUDED__
#ifndef IRR_C_IMAGE_LOADER_PVR_H_INCLUDED
#define IRR_C_IMAGE_LOADER_PVR_H_INCLUDED
#include "IrrCompileConfig.h"
@@ -39,13 +39,13 @@ struct SPVRHeader
class CImageLoaderPVR : public IImageLoader
{
public:
virtual bool isALoadableFileExtension(const io::path& filename) const _IRR_OVERRIDE_;
virtual bool isALoadableFileExtension(const io::path& filename) const IRR_OVERRIDE;
virtual bool isALoadableFileFormat(io::IReadFile* file) const _IRR_OVERRIDE_;
virtual bool isALoadableFileFormat(io::IReadFile* file) const IRR_OVERRIDE;
virtual IImage* loadImage(io::IReadFile* file) const _IRR_OVERRIDE_;
virtual IImage* loadImage(io::IReadFile* file) const IRR_OVERRIDE;
virtual core::array<IImage*> loadImages(io::IReadFile* file, E_TEXTURE_TYPE* type) const _IRR_OVERRIDE_;
virtual core::array<IImage*> loadImages(io::IReadFile* file, E_TEXTURE_TYPE* type) const IRR_OVERRIDE;
};
}