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 1131d58..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) 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");
         }
       }
     }
@@ -166,7 +166,7 @@ bool NativeImageSource::GetPixels(std::vector<unsigned char>& pixbuf, unsigned&
   DALI_ASSERT_DEBUG(pXImage && "XImage (from pixmap) could not be retrieved from the server");
   if(!pXImage)
   {
-    DALI_LOG_ERROR("Could not retrieve Ximage.");
+    DALI_LOG_ERROR("Could not retrieve Ximage.\n");
   }
   else
   {
@@ -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)
@@ -229,7 +229,7 @@ bool NativeImageSource::GetPixels(std::vector<unsigned char>& pixbuf, unsigned&
         }
         else
         {
-          DALI_LOG_ERROR("XImage has null data pointer.");
+          DALI_LOG_ERROR("XImage has null data pointer.\n");
         }
         break;
       }
@@ -242,13 +242,13 @@ bool NativeImageSource::GetPixels(std::vector<unsigned char>& pixbuf, unsigned&
       }
       default:
       {
-        DALI_LOG_WARNING("Pixmap has unsupported bit-depth for getting pixels: %u", pXImage->depth);
+        DALI_LOG_WARNING("Pixmap has unsupported bit-depth for getting pixels: %u\n", pXImage->depth);
       }
     }
   }
   if(!success)
   {
-    DALI_LOG_ERROR("Failed to get pixels from NativeImageSource.");
+    DALI_LOG_ERROR("Failed to get pixels from NativeImageSource.\n");
     pixbuf.resize(0);
     width = 0;
     height = 0;
@@ -323,6 +323,10 @@ unsigned int NativeImageSource::TargetTexture()
   return 0;
 }
 
+void NativeImageSource::PrepareTexture()
+{
+}
+
 int NativeImageSource::GetPixelDepth(Dali::NativeImageSource::ColorDepth depth) const
 {
   switch (depth)
@@ -383,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