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 "PixelArea support for ImageView" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
image-view
/
image-view-impl.h
diff --git
a/dali-toolkit/internal/controls/image-view/image-view-impl.h
b/dali-toolkit/internal/controls/image-view/image-view-impl.h
index
86437ff
..
19d75ac
100644
(file)
--- a/
dali-toolkit/internal/controls/image-view/image-view-impl.h
+++ b/
dali-toolkit/internal/controls/image-view/image-view-impl.h
@@
-38,7
+38,7
@@
namespace Internal
{
class ImageView : public Control
{
{
class ImageView : public Control
{
-
protected:
+protected:
/**
* Construct a new ImageView.
/**
* Construct a new ImageView.
@@
-50,8
+50,6
@@
class ImageView : public Control
*/
virtual ~ImageView();
*/
virtual ~ImageView();
-
-
public:
/**
* Create a new ImageView.
public:
/**
* Create a new ImageView.
@@
-131,14
+129,6
@@
private: // From Control
virtual float GetWidthForHeight( float height );
private:
virtual float GetWidthForHeight( float height );
private:
- /**
- * Attaches mImage member to the renderer, creating the renderers, samplers, meshes and materials if needed
- *
- * @pre mImage has been initialised
- */
- void AttachImage();
-
-private:
// Undefined
ImageView( const ImageView& );
ImageView& operator=( const ImageView& );
// Undefined
ImageView( const ImageView& );
ImageView& operator=( const ImageView& );