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

Images/[Compressed]ImageData can be created using any Data, instead of just files or FileData.

Browse Source 
--HG--
branch : minor
This commit is contained in:
Alex Szpakowski
2017-08-05 23:55:20 -03:00
parent 9654376bdd
commit 2dd6408d00
29 changed files with 130 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/image/wrap_Image.cpp
+5 -5
View File
@@ -19,7 +19,7 @@
**/
#include "wrap_Image.h"
#include "common/wrap_Data.h"
#include "common/Data.h"
#include "common/StringMap.h"
@@ -77,9 +77,9 @@ int w_newImageData(lua_State *L)
t->release();
return 1;
}
else if (filesystem::luax_cangetfiledata(L, 1)) // Case 2: File(Data).
else if (filesystem::luax_cangetfiledata(L, 1) || luax_istype(L, 1, Data::type)) // Case 2: File(Data).
{
filesystem::FileData *data = love::filesystem::luax_getfiledata(L, 1);
Data *data = love::filesystem::luax_getdata(L, 1);
ImageData *t = nullptr;
luax_catchexcept(L,
@@ -99,7 +99,7 @@ int w_newImageData(lua_State *L)
int w_newCompressedData(lua_State *L)
{
love::filesystem::FileData *data = love::filesystem::luax_getfiledata(L, 1);
Data *data = love::filesystem::luax_getdata(L, 1);
CompressedImageData *t = nullptr;
luax_catchexcept(L,
@@ -114,7 +114,7 @@ int w_newCompressedData(lua_State *L)
int w_isCompressed(lua_State *L)
{
love::filesystem::FileData *data = love::filesystem::luax_getfiledata(L, 1);
Data *data = love::filesystem::luax_getdata(L, 1);
bool compressed = instance()->isCompressed(data);
data->release();