[3.0] Remove/move experimental features

[platform/core/uifw/dali-core.git] / dali / public-api / images / resource-image.cpp

diff --git a/dali/public-api/images/resource-image.cpp b/dali/public-api/images/resource-image.cpp
index 3866d9d..c87cc0a 100644 (file)
--- a/dali/public-api/images/resource-image.cpp
+++ b/dali/public-api/images/resource-image.cpp
@@ -19,8 +19,7 @@
 #include <dali/public-api/images/resource-image.h>
 
 // INTERNAL INCLUDES
-#include <dali/public-api/images/image-attributes.h>
-#include <dali/public-api/math/vector2.h>
+#include <dali/internal/common/image-attributes.h>
 #include <dali/internal/event/images/resource-image-impl.h>
 #include <dali/internal/event/common/thread-local-storage.h>
 #include <dali/integration-api/platform-abstraction.h>
@@ -28,10 +27,11 @@
 namespace Dali
 {
 
-Vector2 ResourceImage::GetImageSize( const std::string& url )
+ImageDimensions ResourceImage::GetImageSize( const std::string& url )
 {
-  Vector2 size;
-  Internal::ThreadLocalStorage::Get().GetPlatformAbstraction().GetClosestImageSize( url, ImageAttributes::DEFAULT_ATTRIBUTES, size );
+  const Internal::ImageAttributes& attribs = Internal::ImageAttributes::DEFAULT_ATTRIBUTES;
+  const ImageDimensions desiredSize = ImageDimensions( attribs.GetWidth(), attribs.GetHeight() );
+  const ImageDimensions size = Internal::ThreadLocalStorage::Get().GetPlatformAbstraction().GetClosestImageSize( url, desiredSize, attribs.GetScalingMode(), attribs.GetFilterMode(), attribs.GetOrientationCorrection() );
   return size;
 }
 
@@ -58,31 +58,21 @@ ResourceImage& ResourceImage::operator=( const ResourceImage& rhs )
   return *this;
 }
 
-ResourceImage ResourceImage::New( const std::string& url )
+ResourceImage ResourceImage::New( const std::string& url, bool orientationCorrection )
 {
-  Internal::ResourceImagePtr internal = Internal::ResourceImage::New( url,
-                                                         Dali::ImageAttributes::DEFAULT_ATTRIBUTES );
-  return ResourceImage(internal.Get());
+  Internal::ImageAttributes attributes = Internal::ImageAttributes::DEFAULT_ATTRIBUTES;
+  attributes.SetOrientationCorrection( orientationCorrection );
+  return ResourceImage( Internal::ResourceImage::New( url, attributes ).Get() );
 }
 
-ResourceImage ResourceImage::New( const std::string& url, LoadPolicy loadPol, ReleasePolicy releasePol )
+ResourceImage ResourceImage::New( const std::string& url, ImageDimensions size, FittingMode::Type scalingMode, SamplingMode::Type samplingMode, bool orientationCorrection )
 {
-  Internal::ResourceImagePtr internal = Internal::ResourceImage::New( url,
-                                                         Dali::ImageAttributes::DEFAULT_ATTRIBUTES,
-                                                         loadPol, releasePol );
-  return ResourceImage(internal.Get());
-}
-
-ResourceImage ResourceImage::New( const std::string& url, const ImageAttributes& attributes )
-{
-  Internal::ResourceImagePtr internal = Internal::ResourceImage::New( url, attributes );
-  return ResourceImage(internal.Get());
-}
-
-ResourceImage ResourceImage::New( const std::string& url, const ImageAttributes& attributes, LoadPolicy loadPol, ReleasePolicy releasePol )
-{
-  Internal::ResourceImagePtr internal = Internal::ResourceImage::New( url, attributes, loadPol, releasePol );
-  return ResourceImage(internal.Get());
+  Internal::ImageAttributes attributes = Internal::ImageAttributes::DEFAULT_ATTRIBUTES;
+  attributes.SetSize( Size( size.GetWidth(), size.GetHeight() ) );
+  attributes.SetScalingMode( scalingMode );
+  attributes.SetFilterMode( samplingMode );
+  attributes.SetOrientationCorrection( orientationCorrection );
+  return ResourceImage( Internal::ResourceImage::New( url, attributes ).Get() );
 }
 
 ResourceImage ResourceImage::DownCast( BaseHandle handle )
@@ -90,11 +80,6 @@ ResourceImage ResourceImage::DownCast( BaseHandle handle )
   return ResourceImage( dynamic_cast<Dali::Internal::ResourceImage*>(handle.GetObjectPtr()) );
 }
 
-ResourceImage::LoadPolicy ResourceImage::GetLoadPolicy() const
-{
-  return GetImplementation(*this).GetLoadPolicy();
-}
-
 LoadingState ResourceImage::GetLoadingState() const
 {
   return GetImplementation(*this).GetLoadingState();
@@ -110,11 +95,6 @@ void ResourceImage::Reload()
   GetImplementation(*this).Reload();
 }
 
-ImageAttributes ResourceImage::GetAttributes() const
-{
-  return GetImplementation(*this).GetAttributes();
-}
-
 ResourceImage::ResourceImageSignal& ResourceImage::LoadingFinishedSignal()
 {
   return GetImplementation(*this).LoadingFinishedSignal();