X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=adaptors%2Fx11%2Fnative-image-source-impl-x.cpp;h=45562ee9b36adc86ec5a99ff62ef21697df22164;hb=3d2425ed78131e450cea9f61ec19d4420e6a7aa4;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
old mode 100755
new mode 100644
index ef0007e..45562ee
--- 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) 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.
@@ -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<unsigned char>& pixbuf, unsigned&
           pixbuf.resize(width*height*4);
           unsigned * bufPtr = reinterpret_cast<unsigned *>(&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)
@@ -387,7 +387,7 @@ void NativeImageSource::GetPixmapDetails()
   int x, y;
 
   // get the width, height and depth
-  ecore_x_pixmap_geometry_get(mPixmap, &x, &y, (int*)&mWidth, (int*)&mHeight);
+  ecore_x_pixmap_geometry_get( mPixmap, &x, &y, reinterpret_cast< int* >( &mWidth ), reinterpret_cast< int* >( &mHeight ) );
 
   // set whether blending is required according to pixel format based on the depth
   /* default pixel format is RGB888