X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=adaptors%2Fx11%2Fnative-image-source-impl-x.cpp;h=91f32b6d1673242180fd439a1a8636be89dd7a24;hb=e06bef55c72677dfe180ac0749817c056b39a595;hp=ef0007e85202b67bdfbd3d44480339ca11dce0a4;hpb=d96247d2bcba33c68ec23ccb56bb88913e37a6ae;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git diff --git a/adaptors/x11/native-image-source-impl-x.cpp b/adaptors/x11/native-image-source-impl-x.cpp index ef0007e..91f32b6 100755 --- a/adaptors/x11/native-image-source-impl-x.cpp +++ b/adaptors/x11/native-image-source-impl-x.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * Copyright (c) 2016 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. @@ -61,7 +61,7 @@ namespace { if( !XDestroyImage(mXImage) ) { - DALI_ASSERT_DEBUG("XImage deallocation failure"); + DALI_LOG_ERROR("XImage deallocation failure"); } } } @@ -211,7 +211,7 @@ bool NativeImageSource::GetPixels(std::vector& pixbuf, unsigned& pixbuf.resize(width*height*4); unsigned * bufPtr = reinterpret_cast(&pixbuf[0]); const unsigned xDataLineSkip = pXImage->bytes_per_line; - const size_t copy_count = width * 4; + const size_t copy_count = static_cast< size_t >( width ) * 4; pixelFormat = Pixel::BGRA8888; for(unsigned y = height-1; y < height; --y, bufPtr += width)