From e2357b9b5d8243bcf1f54abd339f0b4905855fe0 Mon Sep 17 00:00:00 2001 From: Adeel Kazmi Date: Mon, 8 Jan 2018 16:57:39 +0000 Subject: [PATCH] (AnimatedImageVisual) Fix SVACE Errors Change-Id: Ib52ed23a81c353c5107546a48313e157667c6e93 --- .../visuals/animated-image/animated-image-visual.cpp | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/dali-toolkit/internal/visuals/animated-image/animated-image-visual.cpp b/dali-toolkit/internal/visuals/animated-image/animated-image-visual.cpp index d9c4cd4..51a4cce 100755 --- a/dali-toolkit/internal/visuals/animated-image/animated-image-visual.cpp +++ b/dali-toolkit/internal/visuals/animated-image/animated-image-visual.cpp @@ -495,21 +495,25 @@ void AnimatedImageVisual::LoadFirstBatch() { mImageCache = new RollingGifImageCache( textureManager, *mGifLoading, mFrameCount, *this, cacheSize, batchSize ); } - else if( batchSize > 0 && cacheSize > 0 ) + else if( mImageUrls ) { - if( cacheSize < numUrls ) + if( batchSize > 0 && cacheSize > 0 ) { - mImageCache = new RollingImageCache( textureManager, *mImageUrls, *this, cacheSize, batchSize ); + if( cacheSize < numUrls ) + { + mImageCache = new RollingImageCache( textureManager, *mImageUrls, *this, cacheSize, batchSize ); + } + else + { + mImageCache = new FixedImageCache( textureManager, *mImageUrls, *this, batchSize ); + } } else { - mImageCache = new FixedImageCache( textureManager, *mImageUrls, *this, batchSize ); + mImageCache = new RollingImageCache( textureManager, *mImageUrls, *this, 1, 1 ); } } - else - { - mImageCache = new RollingImageCache( textureManager, *mImageUrls, *this, 1, 1 ); - } + if (!mImageCache) { DALI_LOG_ERROR("mImageCache is null"); -- 2.7.4