projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Rename of Control Renderers to Visuals" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
public-api
/
controls
/
image-view
/
image-view.cpp
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
6408c19
..
2726af5
100644
(file)
--- a/
dali-toolkit/public-api/controls/image-view/image-view.cpp
+++ b/
dali-toolkit/public-api/controls/image-view/image-view.cpp
@@
-62,7
+62,7
@@
ImageView ImageView::New( Image image )
{
ImageView imageView = Internal::ImageView::New();
imageView.SetImage( image );
{
ImageView imageView = Internal::ImageView::New();
imageView.SetImage( image );
- return
ImageView( imageView )
;
+ return
imageView
;
}
ImageView ImageView::New( const std::string& url )
}
ImageView ImageView::New( const std::string& url )
@@
-101,7
+101,7
@@
void ImageView::SetImage( const std::string& url, ImageDimensions size )
Image ImageView::GetImage() const
{
Image ImageView::GetImage() const
{
- return Image();
+ return
Dali::Toolkit::GetImpl( *this ).Get
Image();
}
ImageView::ImageView( Internal::ImageView& implementation )
}
ImageView::ImageView( Internal::ImageView& implementation )