luanti-org/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-10-26 05:15:27 +01:00
Code Activity

Remove BMP image support (#15434)

Browse Source 
Co-authored-by: Lars Mueller <appgurulars@gmx.de>
This commit is contained in:
sfan5
2024-11-15 12:21:30 +01:00
committed by GitHub
parent 46f0baff09
commit 11837d4623
11 changed files with 6 additions and 713 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/client/client.cpp
View File

@@ -765,7 +765,7 @@ bool Client::loadMedia(const std::string &data, const std::string &filename,
std::string name;
const char *image_ext[] = {
".png", ".jpg", ".bmp", ".tga",
".png", ".jpg", ".tga",
NULL
};
name = removeStringEnd(filename, image_ext);

6
src/client/texturepaths.cpp
View File

@@ -22,10 +22,8 @@ void clearTextureNameCache()
// If failed, return "".
std::string getImagePath(std::string_view path)
{
// A NULL-ended list of possible image extensions
// (In newer C++ versions a fixed size array and ranges::subrange could be used
// or just modernise removeStringEnd.)
static const char *extensions[] = {".png", ".jpg", ".bmp", ".tga", nullptr};
// possible image extensions
static const char *extensions[] = {".png", ".jpg", ".tga", nullptr};
// Remove present extension
std::string_view stripped_path = removeStringEnd(path, extensions);