X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Fpublic-api%2Fcontrols%2Fimage-view%2Fimage-view.cpp;h=02d3e0d67613cfc67fcda57361f69d7e2e13eafc;hb=9795d65d103bdf0524aa92e96475019eff2705f3;hp=e3d2b67a78a7d99bd4f9301827848dc273931d4f;hpb=172678a60aceeb2a60e5d4e5a3c613f8f3c492a9;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-toolkit/public-api/controls/image-view/image-view.cpp b/dali-toolkit/public-api/controls/image-view/image-view.cpp
index e3d2b67..02d3e0d 100644
--- a/dali-toolkit/public-api/controls/image-view/image-view.cpp
+++ b/dali-toolkit/public-api/controls/image-view/image-view.cpp
@@ -19,6 +19,7 @@
 #include <dali-toolkit/public-api/controls/image-view/image-view.h>
 
 // EXTERNAL INCLUDES
+#include <dali/integration-api/debug.h>
 #include <dali/public-api/images/resource-image.h>
 #include <dali/public-api/object/property-map.h>
 
@@ -60,15 +61,24 @@ ImageView ImageView::New()
 
 ImageView ImageView::New( Image image )
 {
+  DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: New() is deprecated and will be removed from next release. use New( const std::string& ) instead.\n" );
+
   ImageView imageView = Internal::ImageView::New();
   imageView.SetImage( image );
-  return ImageView( imageView );
+  return imageView;
 }
 
 ImageView ImageView::New( const std::string& url )
 {
   ImageView imageView = Internal::ImageView::New();
-  imageView.SetImage( url );
+  imageView.SetImage( url, ImageDimensions() );
+  return imageView;
+}
+
+ImageView ImageView::New( const std::string& url, ImageDimensions size )
+{
+  ImageView imageView = Internal::ImageView::New();
+  imageView.SetImage( url, size );
   return imageView;
 }
 
@@ -79,17 +89,26 @@ ImageView ImageView::DownCast( BaseHandle handle )
 
 void ImageView::SetImage( Image image )
 {
+  DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: SetImage() is deprecated and will be removed from next release. Use SetImage( const std::string& ) instead.\n" );
+
   Dali::Toolkit::GetImpl( *this ).SetImage( image );
 }
 
 void ImageView::SetImage( const std::string& url )
 {
-  Dali::Toolkit::GetImpl( *this ).SetImage( url );
+  Dali::Toolkit::GetImpl( *this ).SetImage( url, ImageDimensions() );
+}
+
+void ImageView::SetImage( const std::string& url, ImageDimensions size )
+{
+  Dali::Toolkit::GetImpl( *this ).SetImage( url, size );
 }
 
 Image ImageView::GetImage() const
 {
-  return Image();
+  DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: GetImage() is deprecated and will be removed from next release.\n" );
+
+  return Dali::Toolkit::GetImpl( *this ).GetImage();
 }
 
 ImageView::ImageView( Internal::ImageView& implementation )