atria-soft/ewol
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEV] Update change of egami new API

Browse Source
This commit is contained in:
Edouard DUPIN 2016-07-13 22:27:54 +02:00
parent 21581a6ce0
commit 88382c2564
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ewol/resource/DistanceFieldFont.cpp
View File

@ -414,6 +414,6 @@ bool ewol::resource::DistanceFieldFont::importFromFile() {
prop.m_exist = tmpObj["m_exist"].toBoolean().get(false);
m_listElement.push_back(prop);
}
egami::load(m_data, m_fileName + ".bmp");
return true;
m_data = egami::load(m_fileName + ".bmp");
return m_data.exist();
}

3
ewol/resource/Image.cpp
View File

@ -28,7 +28,8 @@ void ewol::resource::TextureFile::init(std::string _genName, const std::string&
std::unique_lock<std::recursive_mutex> lock(m_mutex);
ewol::resource::Texture::init(_genName);
EWOL_DEBUG("create a new resource::Image : _genName=" << _genName << " _tmpFilename=" << _tmpFilename << " size=" << _size);
if (egami::load(m_data, _tmpFilename, _size) == false) {
m_data = egami::load(_tmpFilename, _size);
if (m_data.exist() == false) {
EWOL_ERROR("ERROR when loading the image : " << _tmpFilename);
}
//egami::store(m_data, "tmpResult.bmp");

3
ewol/resource/ImageDF.cpp
View File

@ -26,7 +26,8 @@ void ewol::resource::ImageDF::init(std::string _genName, const std::string& _tmp
std::unique_lock<std::recursive_mutex> lock(m_mutex);
ewol::resource::Texture::init(_genName);
EWOL_DEBUG("create a new resource::Image : _genName=" << _genName << " _tmpfileName=" << _tmpfileName << " size=" << _size);
if (false == egami::load(m_data, _tmpfileName, _size)) {
m_data = egami::load(_tmpfileName, _size);
if (m_data.exist() == false) {
EWOL_ERROR("ERROR when loading the image : " << _tmpfileName);
}
ivec2 tmp = m_data.getSize();