X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Fdevel-api%2Fimages%2Fdistance-field.cpp;h=6e4346dbb7c9a6e8bb4c8c55ebb41f01bf59a82c;hb=0643c768fd100bd7ffb522e3358b88d075bc1d2e;hp=bb4224aeaffd5892e5ffac0c472446fcdf419ae2;hpb=6e8df13ec88b05c87733b75a5e1ced441f229935;p=platform%2Fcore%2Fuifw%2Fdali-core.git diff --git a/dali/devel-api/images/distance-field.cpp b/dali/devel-api/images/distance-field.cpp index bb4224a..6e4346d 100644 --- a/dali/devel-api/images/distance-field.cpp +++ b/dali/devel-api/images/distance-field.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016 Samsung Electronics Co., Ltd. + * Copyright (c) 2017 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -196,8 +196,8 @@ void GenerateDistanceFieldMap(const unsigned char* const imagePixels, const Size { for ( int x = 0; x < paddedWidth; ++x) { - if( y < (int)fieldBorder || y >= (paddedHeight - (int)fieldBorder) || - x < (int)fieldBorder || x >= (paddedWidth - (int)fieldBorder) ) + if( y < static_cast< int >( fieldBorder ) || y >= ( paddedHeight - static_cast< int >( fieldBorder ) ) || + x < static_cast< int >( fieldBorder ) || x >= ( paddedWidth - static_cast< int >( fieldBorder ) ) ) { outside[ y * paddedWidth + x ] = MAX_DISTANCE; inside[ y * paddedWidth + x ] = 0.0f;