X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;ds=sidebyside;f=dali-toolkit%2Finternal%2Fvisuals%2Fimage-atlas-manager.cpp;h=2e4dfb4ad86b7046207824707b2b965976b92a72;hb=cd7dc06c6d16fa60bb27a2454b7e79cdf4d4d7a2;hp=fe01571da7421e1de521d51abe274d4c8cad7e47;hpb=1ff26466c5458cda1de2997cd4e27b014ff0275a;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-toolkit/internal/visuals/image-atlas-manager.cpp b/dali-toolkit/internal/visuals/image-atlas-manager.cpp
index fe01571..2e4dfb4 100644
--- a/dali-toolkit/internal/visuals/image-atlas-manager.cpp
+++ b/dali-toolkit/internal/visuals/image-atlas-manager.cpp
@@ -20,7 +20,7 @@
 
 // EXTERNAL HEADER
 #include <dali/devel-api/images/texture-set-image.h>
-#include <dali/public-api/images/resource-image.h>
+#include <dali/devel-api/adaptor-framework/image-loading.h>
 
 namespace Dali
 {
@@ -49,7 +49,7 @@ ImageAtlasManager::~ImageAtlasManager()
 
 TextureSet ImageAtlasManager::Add( Vector4& textureRect,
                                  const std::string& url,
-                                 ImageDimensions size,
+                                 ImageDimensions& size,
                                  FittingMode::Type fittingMode,
                                  bool orientationCorrection,
                                  AtlasUploadObserver* atlasUploadObserver )
@@ -58,7 +58,7 @@ TextureSet ImageAtlasManager::Add( Vector4& textureRect,
   ImageDimensions zero;
   if( size == zero )
   {
-    dimensions = ResourceImage::GetImageSize( url );
+    dimensions = Dali::GetClosestImageSize( url );
   }
 
   // big image, atlasing is not applied
@@ -68,6 +68,7 @@ TextureSet ImageAtlasManager::Add( Vector4& textureRect,
   {
     return TextureSet();
   }
+  size = dimensions;
 
   unsigned int i = 0;
   for( AtlasContainer::iterator iter = mAtlasList.begin(); iter != mAtlasList.end(); ++iter)