mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-01-29 03:32:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

lua: the Color(integer) ctor behavior will depend on the active color mode

Browse Source
This commit is contained in:
David Capello 2018-09-13 10:54:44 -03:00
parent fdac96153b
commit be8f026b91
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/app/script/color_class.cpp
View File

@ -8,6 +8,7 @@
#include "config.h" #include "config.h"
#endif #endif
#include "app/app.h"
#include "app/color.h" #include "app/color.h"
#include "app/color_utils.h" #include "app/color_utils.h"
#include "app/script/luacpp.h" #include "app/script/luacpp.h"
@ -138,10 +139,21 @@ Color Color_new(lua_State* L, int index)
else if (!lua_isnone(L, index)) { else if (!lua_isnone(L, index)) {
if (lua_isinteger(L, index) && lua_isnone(L, index+1)) { if (lua_isinteger(L, index) && lua_isnone(L, index+1)) {
doc::color_t docColor = lua_tointeger(L, index); doc::color_t docColor = lua_tointeger(L, index);
color = app::Color::fromRgb(doc::rgba_getr(docColor), switch (app_get_current_pixel_format()) {
doc::rgba_getg(docColor), case IMAGE_RGB:
doc::rgba_getb(docColor), color = app::Color::fromRgb(doc::rgba_getr(docColor),
doc::rgba_geta(docColor)); doc::rgba_getg(docColor),
doc::rgba_getb(docColor),
doc::rgba_geta(docColor));
break;
case IMAGE_GRAYSCALE:
color = app::Color::fromGray(doc::graya_getv(docColor),
doc::graya_geta(docColor));
break;
case IMAGE_INDEXED:
color = app::Color::fromIndex(docColor);
break;
}
} }
else { else {
color = app::Color::fromRgb(lua_tointeger(L, index), color = app::Color::fromRgb(lua_tointeger(L, index),