mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-04-01 10:21:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master'

Browse Source
This commit is contained in:
David Capello 2016-05-03 12:43:51 -03:00
commit aededaaeab
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/doc/file/gpl_file.cpp
View File

@ -53,8 +53,11 @@ Palette* load_gpl_file(const char *filename)
std::istringstream lineIn(line); std::istringstream lineIn(line);
// TODO add support to read the color name // TODO add support to read the color name
lineIn >> r >> g >> b; lineIn >> r >> g >> b;
if (lineIn.good())
pal->addEntry(rgba(r, g, b, 255)); if (lineIn.fail())
continue;
pal->addEntry(rgba(r, g, b, 255));
} }
return pal.release(); return pal.release();