Revert "[Tizen] Generate url and load texture from encoded image buffer"

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / image-loader / image-load-thread.cpp

diff --git a/dali-toolkit/internal/image-loader/image-load-thread.cpp b/dali-toolkit/internal/image-loader/image-load-thread.cpp
index d5ba7ab..7fc344f 100644 (file)
--- a/dali-toolkit/internal/image-loader/image-load-thread.cpp
+++ b/dali-toolkit/internal/image-loader/image-load-thread.cpp
@@ -19,7 +19,6 @@
 #include "image-load-thread.h"
 
 // EXTERNAL INCLUDES
-#include <dali/public-api/adaptor-framework/encoded-image-buffer.h>
 #include <dali/devel-api/adaptor-framework/image-loading.h>
 #include <dali/devel-api/adaptor-framework/thread-settings.h>
 #include <dali/integration-api/adaptor-framework/adaptor.h>
@@ -34,7 +33,6 @@ namespace Internal
 LoadingTask::LoadingTask(uint32_t id, Dali::AnimatedImageLoading animatedImageLoading, uint32_t frameIndex)
 : pixelBuffer(),
   url(),
-  encodedImageBuffer(),
   id(id),
   dimensions(),
   fittingMode(),
@@ -53,26 +51,6 @@ LoadingTask::LoadingTask(uint32_t id, Dali::AnimatedImageLoading animatedImageLo
 LoadingTask::LoadingTask(uint32_t id, const VisualUrl& url, ImageDimensions dimensions, FittingMode::Type fittingMode, SamplingMode::Type samplingMode, bool orientationCorrection, DevelAsyncImageLoader::PreMultiplyOnLoad preMultiplyOnLoad)
 : pixelBuffer(),
   url(url),
-  encodedImageBuffer(),
-  id(id),
-  dimensions(dimensions),
-  fittingMode(fittingMode),
-  samplingMode(samplingMode),
-  orientationCorrection(orientationCorrection),
-  preMultiplyOnLoad(preMultiplyOnLoad),
-  isMaskTask(false),
-  maskPixelBuffer(),
-  contentScale(1.0f),
-  cropToMask(false),
-  animatedImageLoading(),
-  frameIndex(0u)
-{
-}
-
-LoadingTask::LoadingTask(uint32_t id, const VisualUrl& url, const EncodedImageBuffer& encodedImageBuffer, ImageDimensions dimensions, FittingMode::Type fittingMode, SamplingMode::Type samplingMode, bool orientationCorrection, DevelAsyncImageLoader::PreMultiplyOnLoad preMultiplyOnLoad)
-: pixelBuffer(),
-  url(url),
-  encodedImageBuffer(encodedImageBuffer),
   id(id),
   dimensions(dimensions),
   fittingMode(fittingMode),
@@ -91,7 +69,6 @@ LoadingTask::LoadingTask(uint32_t id, const VisualUrl& url, const EncodedImageBu
 LoadingTask::LoadingTask(uint32_t id, Devel::PixelBuffer pixelBuffer, Devel::PixelBuffer maskPixelBuffer, float contentScale, bool cropToMask, DevelAsyncImageLoader::PreMultiplyOnLoad preMultiplyOnLoad)
 : pixelBuffer(pixelBuffer),
   url(""),
-  encodedImageBuffer(),
   id(id),
   dimensions(),
   fittingMode(),
@@ -117,13 +94,6 @@ void LoadingTask::Load()
   {
     pixelBuffer = Dali::LoadImageFromFile(url.GetUrl(), dimensions, fittingMode, samplingMode, orientationCorrection);
   }
-  else if(url.IsBufferResource())
-  {
-    if(encodedImageBuffer)
-    {
-      pixelBuffer = Dali::LoadImageFromBuffer(encodedImageBuffer.GetRawBuffer(), dimensions, fittingMode, samplingMode, orientationCorrection);
-    }
-  }
   else
   {
     pixelBuffer = Dali::DownloadImageSynchronously(url.GetUrl(), dimensions, fittingMode, samplingMode, orientationCorrection);