(Image) Make Image GetWidth and GetHeight return natural size

[Issue#]  N/A

[Problem] The size of the image should be available at all times

[Cause] N/A

[Solution] Make GetWidth and GetHeight return the natural size

Change-Id: I92f9374b8582c92a356abd62af277cf6b73af86c

diff --git a/dali/internal/event/images/image-impl.cpp b/dali/internal/event/images/image-impl.cpp
index c96a87e..2668f9a 100644 (file)
--- a/dali/internal/event/images/image-impl.cpp
+++ b/dali/internal/event/images/image-impl.cpp
@@ -205,38 +205,14 @@ void Image::ResourceSavingFailed( const ResourceTicket& ticket )
 
 unsigned int Image::GetWidth() const
 {
-  if( mTicket )
-  {
-    const ImageAttributes& attr = mImageFactory.GetActualAttributes( mTicket->GetId() );
-    return attr.GetWidth();
-  }
-  else if( mRequest )
-  {
-    const ImageAttributes& attr = mImageFactory.GetRequestAttributes( mRequest.Get() );
-    return attr.GetWidth();
-  }
-  else
-  {
-    return mWidth;
-  }
+  // Width has already been calculated - just return that
+  return mWidth;
 }
 
 unsigned int Image::GetHeight() const
 {
-  if( mTicket )
-  {
-    const ImageAttributes& attr = mImageFactory.GetActualAttributes( mTicket->GetId() );
-    return attr.GetHeight();
-  }
-  else if( mRequest )
-  {
-    const ImageAttributes& attr = mImageFactory.GetRequestAttributes( mRequest.Get() );
-    return attr.GetHeight();
-  }
-  else
-  {
-    return mHeight;
-  }
+  // Height has already been calculated - just return that
+  return mHeight;
 }
 
 Vector2 Image::GetNaturalSize() const