Revert "[4.0] Exposing Exif Image metadata"

[platform/core/uifw/dali-adaptor.git] / platform-abstractions / tizen / image-loaders / loader-ktx.cpp

diff --git a/platform-abstractions/tizen/image-loaders/loader-ktx.cpp b/platform-abstractions/tizen/image-loaders/loader-ktx.cpp
index fc67104..d39c361 100755 (executable)
--- a/platform-abstractions/tizen/image-loaders/loader-ktx.cpp
+++ b/platform-abstractions/tizen/image-loaders/loader-ktx.cpp
@@ -19,13 +19,19 @@
 #include "loader-ktx.h"
 
 // EXTERNAL INCLUDES
+#include <cstdio>
+#include <cstdlib>
 #include <cstring>
+#include <stdint.h>
 #include <dali/public-api/common/compile-time-assert.h>
 #include <dali/integration-api/debug.h>
-#include <adaptors/devel-api/adaptor-framework/pixel-buffer.h>
+#include <dali/integration-api/bitmap.h>
+#include <dali/public-api/images/pixel.h>
 
 namespace Dali
 {
+using Integration::Bitmap;
+using Dali::Integration::PixelBuffer;
 
 namespace TizenPlatform
 {
@@ -532,7 +538,7 @@ bool LoadKtxHeader( const ImageLoader::Input& input, unsigned int& width, unsign
 }
 
 // File loading API entry-point:
-bool LoadBitmapFromKtx( const ImageLoader::Input& input, Dali::Devel::PixelBuffer& bitmap )
+bool LoadBitmapFromKtx( const ImageLoader::Input& input, Integration::Bitmap& bitmap )
 {
   DALI_COMPILE_TIME_ASSERT( sizeof(Byte) == 1);
   DALI_COMPILE_TIME_ASSERT( sizeof(uint32_t) == 4);
@@ -586,9 +592,7 @@ bool LoadBitmapFromKtx( const ImageLoader::Input& input, Dali::Devel::PixelBuffe
   }
 
   // Load up the image bytes:
-  bitmap = Dali::Devel::PixelBuffer::New(width, height, pixelFormat);
-  auto pixels = bitmap.GetBuffer();
-
+  PixelBuffer* const pixels = bitmap.GetCompressedProfile()->ReserveBufferOfSize( pixelFormat, width, height, imageByteCount );
   if(!pixels)
   {
     DALI_LOG_ERROR( "Unable to reserve a pixel buffer to load the requested bitmap into.\n" );