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

Merge default into minor

Browse Source 
--HG--
branch : minor
This commit is contained in:
Alex Szpakowski
2016-08-29 22:41:24 -03:00
parent daf13de4eb d572c70883
commit ef61573cd3
23 changed files with 232 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/image/wrap_Image.cpp
+16 -11
View File
@@ -77,19 +77,24 @@ int w_newImageData(lua_State *L)
t->release();
return 1;
}
else if (filesystem::luax_cangetfiledata(L, 1)) // Case 2: File(Data).
{
filesystem::FileData *data = love::filesystem::luax_getfiledata(L, 1);
// Case 2: File(Data).
love::filesystem::FileData *data = love::filesystem::luax_getfiledata(L, 1);
ImageData *t = nullptr;
luax_catchexcept(L,
[&]() { t = instance()->newImageData(data); },
[&](bool) { data->release(); }
);
ImageData *t = nullptr;
luax_catchexcept(L,
[&]() { t = instance()->newImageData(data); },
[&](bool) { data->release(); }
);
luax_pushtype(L, IMAGE_IMAGE_DATA_ID, t);
t->release();
return 1;
luax_pushtype(L, IMAGE_IMAGE_DATA_ID, t);
t->release();
return 1;
}
else
{
return luax_typerror(L, 1, "value");
}
}
int w_newCompressedData(lua_State *L)