diff --git a/src/Nazara/Utility/Loaders/PCX/Loader.cpp b/src/Nazara/Utility/Loaders/PCX/Loader.cpp index f78ce358d..ec453b566 100644 --- a/src/Nazara/Utility/Loaders/PCX/Loader.cpp +++ b/src/Nazara/Utility/Loaders/PCX/Loader.cpp @@ -37,7 +37,7 @@ namespace nzUInt8 padding[54]; }; - bool NzLoader_PCX_Check(NzInputStream& stream, const NzImageParams& parameters) + bool Check(NzInputStream& stream, const NzImageParams& parameters) { NazaraUnused(parameters); @@ -48,7 +48,7 @@ namespace return manufacturer == 0x0a; } - bool NzLoader_PCX_Load(NzImage* image, NzInputStream& stream, const NzImageParams& parameters) + bool Load(NzImage* image, NzInputStream& stream, const NzImageParams& parameters) { NazaraUnused(parameters); @@ -59,7 +59,7 @@ namespace return false; } - #if defined(NAZARA_BIG_ENDIAN) + #ifdef NAZARA_BIG_ENDIAN // Les fichiers PCX sont en little endian NzByteSwap(&header.xmin, sizeof(nzUInt16)); NzByteSwap(&header.ymin, sizeof(nzUInt16)); @@ -337,10 +337,10 @@ namespace void NzLoaders_PCX_Register() { - NzImageLoader::RegisterLoader("pcx", NzLoader_PCX_Check, NzLoader_PCX_Load); + NzImageLoader::RegisterLoader("pcx", Check, Load); } void NzLoaders_PCX_Unregister() { - NzImageLoader::UnregisterLoader("pcx", NzLoader_PCX_Check, NzLoader_PCX_Load); + NzImageLoader::UnregisterLoader("pcx", Check, Load); } diff --git a/src/Nazara/Utility/Loaders/STB/Loader.cpp b/src/Nazara/Utility/Loaders/STB/Loader.cpp index 86047d350..6baad965a 100644 --- a/src/Nazara/Utility/Loaders/STB/Loader.cpp +++ b/src/Nazara/Utility/Loaders/STB/Loader.cpp @@ -37,7 +37,7 @@ namespace static stbi_io_callbacks callbacks = {Read, Skip, Eof}; - bool NzLoader_STB_Check(NzInputStream& stream, const NzImageParams& parameters) + bool Check(NzInputStream& stream, const NzImageParams& parameters) { NazaraUnused(parameters); @@ -45,7 +45,7 @@ namespace return stbi_info_from_callbacks(&callbacks, &stream, &width, &height, &bpp); } - bool NzLoader_STB_Load(NzImage* image, NzInputStream& stream, const NzImageParams& parameters) + bool Load(NzImage* image, NzInputStream& stream, const NzImageParams& parameters) { static const nzPixelFormat formats[4] = { @@ -117,10 +117,10 @@ namespace void NzLoaders_STB_Register() { - NzImageLoader::RegisterLoader("bmp,gif,hdr,jpg,jpeg,pic,png,psd,tga", NzLoader_STB_Check, NzLoader_STB_Load); + NzImageLoader::RegisterLoader("bmp,gif,hdr,jpg,jpeg,pic,png,psd,tga", Check, Load); } void NzLoaders_STB_Unregister() { - NzImageLoader::UnregisterLoader("bmp,gif,hdr,jpg,jpeg,pic,png,psd,tga", NzLoader_STB_Check, NzLoader_STB_Load); + NzImageLoader::UnregisterLoader("bmp,gif,hdr,jpg,jpeg,pic,png,psd,tga", Check, Load); }