If an application sets an empty path to the alpha mask, unload the alpha mask.
Change-Id: Ieeaaddd0e999e08778ff84c35e1c601dbdd8b038
{
Devel::PixelBuffer pixelBuffer = LoadImageFromFile( url.GetUrl(), desiredSize, fittingMode, samplingMode,
orientationCorrection );
{
Devel::PixelBuffer pixelBuffer = LoadImageFromFile( url.GetUrl(), desiredSize, fittingMode, samplingMode,
orientationCorrection );
+ if( maskInfo && maskInfo->mAlphaMaskUrl.IsValid() )
{
Devel::PixelBuffer maskPixelBuffer = LoadImageFromFile( maskInfo->mAlphaMaskUrl.GetUrl(), ImageDimensions(),
FittingMode::SCALE_TO_FILL, SamplingMode::NO_FILTER, true );
{
Devel::PixelBuffer maskPixelBuffer = LoadImageFromFile( maskInfo->mAlphaMaskUrl.GetUrl(), ImageDimensions(),
FittingMode::SCALE_TO_FILL, SamplingMode::NO_FILTER, true );
if( !textureSet ) // big image, no atlasing or atlasing failed
{
atlasingStatus = false;
if( !textureSet ) // big image, no atlasing or atlasing failed
{
atlasingStatus = false;
+ if( !maskInfo || !maskInfo->mAlphaMaskUrl.IsValid() )
{
textureId = RequestLoad( url, desiredSize, fittingMode, samplingMode, TextureManager::NO_ATLAS,
textureObserver, orientationCorrection, reloadPolicy, preMultiplyOnLoad );
{
textureId = RequestLoad( url, desiredSize, fittingMode, samplingMode, TextureManager::NO_ATLAS,
textureObserver, orientationCorrection, reloadPolicy, preMultiplyOnLoad );