Update BitmapLoader to use PixelData

[platform/core/uifw/dali-adaptor.git] / adaptors / devel-api / adaptor-framework / bitmap-loader.cpp

diff --git a/adaptors/devel-api/adaptor-framework/bitmap-loader.cpp b/adaptors/devel-api/adaptor-framework/bitmap-loader.cpp
index 142e600..6f25a81 100644 (file)
--- a/adaptors/devel-api/adaptor-framework/bitmap-loader.cpp
+++ b/adaptors/devel-api/adaptor-framework/bitmap-loader.cpp
@@ -20,20 +20,19 @@
 // EXTERNAL INCLUDES
 #include <string>
 
-#include <dali/integration-api/bitmap.h>
-#include <dali/integration-api/resource-types.h>
-#include <dali/integration-api/resource-cache.h>
-
 // INTERNAL INCLUDES
-#include "image-loaders/image-loader.h"
 #include <bitmap-loader-impl.h>
 
 namespace Dali
 {
 
-BitmapLoader BitmapLoader::New(const std::string& filename)
+BitmapLoader BitmapLoader::New( const std::string& url,
+                                ImageDimensions size,
+                                FittingMode::Type fittingMode,
+                                SamplingMode::Type samplingMode,
+                                bool orientationCorrection)
 {
-  IntrusivePtr<Internal::BitmapLoader> internal = Internal::BitmapLoader::New(filename);
+  IntrusivePtr<Internal::BitmapLoader> internal = Internal::BitmapLoader::New(url, size, fittingMode, samplingMode, orientationCorrection);
   return BitmapLoader( internal.Get() );
 }
 
@@ -61,29 +60,24 @@ BitmapLoader& BitmapLoader::operator=(const BitmapLoader& rhs)
   return *this;
 }
 
-unsigned char* BitmapLoader::GetPixelData() const
-{
-  return GetImplementation(*this).GetPixelData();
-}
-
-unsigned int BitmapLoader::GetImageHeight() const
+void BitmapLoader::Load()
 {
-  return GetImplementation(*this).GetImageHeight();
+  GetImplementation(*this).Load();
 }
 
-unsigned int BitmapLoader::GetImageWidth() const
+bool BitmapLoader::IsLoaded()
 {
-  return GetImplementation(*this).GetImageWidth();
+  return GetImplementation(*this).IsLoaded();
 }
 
-unsigned int BitmapLoader::GetBufferStride() const
+std::string BitmapLoader::GetUrl() const
 {
-  return GetImplementation(*this).GetBufferStride();
+  return GetImplementation(*this).GetUrl();
 }
 
-Pixel::Format BitmapLoader::GetPixelFormat() const
+PixelDataPtr BitmapLoader::GetPixelData() const
 {
-  return GetImplementation(*this).GetPixelFormat();
+  return GetImplementation(*this).GetPixelData();
 }
 
 } // namespace Dali