blakeridgway/supercell-wx
1
0
Fork 0
mirror of https://github.com/ciphervance/supercell-wx.git synced 2025-10-31 08:50:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Enable loading color palettes from embedded Qt resources

Browse source
This commit is contained in:
Dan Paulat 2023-01-02 00:23:46 -06:00
parent 1f9392e9f6
commit 1d597eb120
8 changed files with 88 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

9
wxdata/source/scwx/common/color_table.cpp
View file

@ -137,13 +137,16 @@ bool ColorTable::IsValid() const
std::shared_ptr<ColorTable> ColorTable::Load(const std::string& filename)
{
logger_->debug("Loading color table: {}", filename);
std::ifstream f(filename, std::ios_base::in);
return Load(f);
}
std::shared_ptr<ColorTable> ColorTable::Load(std::istream& is)
{
std::shared_ptr<ColorTable> p = std::make_shared<ColorTable>();
std::ifstream f(filename, std::ios_base::in);
std::string line;
while (scwx::util::getline(f, line))
while (scwx::util::getline(is, line))
{
std::string token;
std::istringstream tokens(line);