LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-15 15:51:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed detection of TGA and BMP images and updated stb_image to the latest version.

Browse Source 
--HG--
branch : minor
This commit is contained in:
Alex Szpakowski
2014-08-11 03:11:51 -03:00
parent 43a148ce3e
commit fcf8329369
5 changed files with 4440 additions and 1660 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libraries/stb/stb_image.c
-1596
View File
File diff suppressed because it is too large Load Diff
src/libraries/stb/stb_image.h
+4425 -52
View File
File diff suppressed because it is too large Load Diff
src/modules/image/magpie/STBHandler.cpp
+15 -7
View File
@@ -21,11 +21,18 @@
// LOVE
#include "STBHandler.h"
// stb_image
#include "libraries/stb/stb_image.h"
static void loveSTBAssert(bool test, const char *teststr)
{
if (!test)
throw love::Exception("Could not decode image (stb_image assertion '%s' failed)", teststr);
}
// C++
#include <algorithm>
// stb_image
#define STBI_NO_HDR
#define STBI_NO_STDIO
#define STB_IMAGE_IMPLEMENTATION
#define STBI_ASSERT(A) loveSTBAssert((A), #A)
#include "libraries/stb/stb_image.h"
// C
#include <cstdlib>
@@ -39,10 +46,11 @@ namespace magpie
bool STBHandler::canDecode(love::filesystem::FileData *data)
{
std::string ext = data->getExtension();
std::transform(ext.begin(), ext.end(), ext.begin(), tolower);
stbi__context s = {};
stbi__start_mem(&s, (const stbi_uc *) data->getData(), (int) data->getSize());
return (ext.compare("tga") == 0) || (ext.compare("bmp") == 0);
// These are internal stb_image functions, but we can still use them!
return stbi__bmp_test(&s) || stbi__tga_test(&s);
}
bool STBHandler::canEncode(ImageData::Format format)