razzaline/tahoma2d
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

Keep the consistency of mesh image addr, after save operation (#380)

Browse source 
* change MESH_XSHLEVEL to be isImageCompatible true

* add comment and split comparison operator return into true and false
This commit is contained in:
tomosu 2016-06-02 20:37:45 +09:00 committed by Keisuke Ogaki
parent 8d9ba3307e
commit e5f7d89527
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
toonz/sources/toonzlib/imagebuilders.cpp
View file

@ -154,7 +154,10 @@ bool ImageLoader::isImageCompatible(int imFlags, void *extData)
BuildExtData *data = static_cast<BuildExtData *>(extData); BuildExtData *data = static_cast<BuildExtData *>(extData);
const TXshSimpleLevel *sl = data->m_sl; const TXshSimpleLevel *sl = data->m_sl;
if (sl->getType() == PLI_XSHLEVEL)
// NOTE: Vector and Mesh dont care about sub sampling rate and bit depth compatibility.
// They are property of Raster.
if (sl->getType() == PLI_XSHLEVEL || sl->getType() == MESH_XSHLEVEL)
return true; return true;
int subsampling = buildSubsampling(imFlags, data); int subsampling = buildSubsampling(imFlags, data);
@ -162,7 +165,11 @@ bool ImageLoader::isImageCompatible(int imFlags, void *extData)
if (m_subsampling <= 0 || subsampling != m_subsampling) if (m_subsampling <= 0 || subsampling != m_subsampling)
return false; return false;
return (m_64bitCompatible || !(imFlags & ImageManager::is64bitEnabled)); if (m_64bitCompatible || !(imFlags & ImageManager::is64bitEnabled)){
return true;
}else{
return false;
}
} }
//------------------------------------------------------------------------- //-------------------------------------------------------------------------