Revert "[4.0] When native image is destroyed, It call TriggerEventInterface callback."

[platform/core/uifw/dali-adaptor.git] / adaptors / x11 / native-image-source-impl-x.cpp

diff --git a/adaptors/x11/native-image-source-impl-x.cpp b/adaptors/x11/native-image-source-impl-x.cpp
index 779b03a..45562ee 100755 (executable)
--- a/adaptors/x11/native-image-source-impl-x.cpp
+++ b/adaptors/x11/native-image-source-impl-x.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.
@@ -61,7 +61,7 @@ namespace
       {
         if( !XDestroyImage(mXImage) )
         {
-          DALI_ASSERT_DEBUG("XImage deallocation failure");
+          DALI_LOG_ERROR("XImage deallocation failure");
         }
       }
     }
@@ -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