From: Adeel Kazmi <adeel.kazmi@samsung.com>
Date: Tue, 11 Feb 2020 08:30:17 +0000 (+0000)
Subject: Merge "Fix SVACE issue" into devel/master
X-Git-Tag: dali_1.5.0~5
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8b1a81f1588e23f783ad1021aa11ffc7d33a86b4;hp=cfc43c054be1e63ab6c73b622658cd511f5a3d79;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git

Merge "Fix SVACE issue" into devel/master
---

diff --git a/dali/internal/imaging/common/loader-astc.cpp b/dali/internal/imaging/common/loader-astc.cpp
index 4765bf9..1371a65 100755
--- a/dali/internal/imaging/common/loader-astc.cpp
+++ b/dali/internal/imaging/common/loader-astc.cpp
@@ -138,7 +138,9 @@ bool LoadAstcHeader( FILE * const filePointer, unsigned int& width, unsigned int
   width = fileHeader.xsize[0] | ( fileHeader.xsize[1] << 8 ) | ( fileHeader.xsize[2] << 16 );
   height = fileHeader.ysize[0] | ( fileHeader.ysize[1] << 8 ) | ( fileHeader.ysize[2] << 16 );
 
-  const unsigned int zDepth = fileHeader.zsize[0] + ( fileHeader.zsize[1] << 8 ) + ( fileHeader.zsize[2] << 16 );
+  const unsigned int zDepth = static_cast<unsigned int>( fileHeader.zsize[0] )
+                              + ( static_cast<unsigned int>( fileHeader.zsize[1] ) << 8 )
+                              + ( static_cast<unsigned int>( fileHeader.zsize[2] ) << 16 );
 
   // Check image dimensions are within limits.
   if( ( width > MAX_TEXTURE_DIMENSION ) || ( height > MAX_TEXTURE_DIMENSION ) )