diff --git a/src/Nazara/Audio/Formats/libvorbisLoader.cpp b/src/Nazara/Audio/Formats/libvorbisLoader.cpp index 7bc1eb9c7..05baa99d3 100644 --- a/src/Nazara/Audio/Formats/libvorbisLoader.cpp +++ b/src/Nazara/Audio/Formats/libvorbisLoader.cpp @@ -117,10 +117,10 @@ namespace Nz return sampleCount - remainingBytes / sizeof(Int16); } - constexpr auto s_supportedExtensions = frozen::make_unordered_set({ ".oga", ".ogg", ".ogm", ".ogv", ".ogx", ".opus", ".spx" }); - bool IsVorbisSupported(std::string_view extension) { + constexpr auto s_supportedExtensions = frozen::make_unordered_set({ ".oga", ".ogg", ".ogm", ".ogv", ".ogx", ".opus", ".spx" }); + return s_supportedExtensions.find(extension) != s_supportedExtensions.end(); } diff --git a/src/Nazara/Utility/Formats/FreeTypeLoader.cpp b/src/Nazara/Utility/Formats/FreeTypeLoader.cpp index 472b21f77..2596f88d9 100644 --- a/src/Nazara/Utility/Formats/FreeTypeLoader.cpp +++ b/src/Nazara/Utility/Formats/FreeTypeLoader.cpp @@ -378,10 +378,10 @@ namespace Nz mutable unsigned int m_characterSize; }; - constexpr auto s_supportedExtensions = frozen::make_unordered_set({ ".afm", ".bdf", ".cff", ".cid", ".dfont", ".fnt", ".fon", ".otf", ".pfa", ".pfb", ".pfm", ".pfr", ".sfnt", ".ttc", ".tte", ".ttf" }); - bool IsFreetypeSupported(const std::string_view& extension) { + constexpr auto s_supportedExtensions = frozen::make_unordered_set({ ".afm", ".bdf", ".cff", ".cid", ".dfont", ".fnt", ".fon", ".otf", ".pfa", ".pfb", ".pfm", ".pfr", ".sfnt", ".ttc", ".tte", ".ttf" }); + return s_supportedExtensions.find(extension) != s_supportedExtensions.end(); } diff --git a/src/Nazara/Utility/Formats/STBLoader.cpp b/src/Nazara/Utility/Formats/STBLoader.cpp index 126f6203c..9776566a3 100644 --- a/src/Nazara/Utility/Formats/STBLoader.cpp +++ b/src/Nazara/Utility/Formats/STBLoader.cpp @@ -38,10 +38,10 @@ namespace Nz static stbi_io_callbacks s_stbiCallbacks = { StbiRead, StbiSkip, StbiEof }; - constexpr auto s_supportedExtensions = frozen::make_unordered_set({ ".bmp", ".gif", ".hdr", ".jpg", ".jpeg", ".pic", ".png", ".ppm", ".pgm", ".psd", ".tga" }); - bool IsSTBSupported(const std::string_view& extension) { + constexpr auto s_supportedExtensions = frozen::make_unordered_set({ ".bmp", ".gif", ".hdr", ".jpg", ".jpeg", ".pic", ".png", ".ppm", ".pgm", ".psd", ".tga" }); + return s_supportedExtensions.find(extension) != s_supportedExtensions.end(); }