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 "Dali-Text: Keyboard Shortcuts" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
animated-image
/
animated-image-visual.h
diff --git
a/dali-toolkit/internal/visuals/animated-image/animated-image-visual.h
b/dali-toolkit/internal/visuals/animated-image/animated-image-visual.h
old mode 100755
(executable)
new mode 100644
(file)
index
70419d0
..
8e91623
--- a/
dali-toolkit/internal/visuals/animated-image/animated-image-visual.h
+++ b/
dali-toolkit/internal/visuals/animated-image/animated-image-visual.h
@@
-154,7
+154,7
@@
protected:
/**
* @brief A reference counted object may only be deleted by calling Unreference().
*/
/**
* @brief A reference counted object may only be deleted by calling Unreference().
*/
-
virtual ~AnimatedImageVisual()
;
+
~AnimatedImageVisual() override
;
/**
* @copydoc Visual::Base::DoSetProperties
/**
* @copydoc Visual::Base::DoSetProperties
@@
-216,7
+216,7
@@
private:
* Called when the next frame is ready.
* @param[in] textureSet the texture set to apply
*/
* Called when the next frame is ready.
* @param[in] textureSet the texture set to apply
*/
- void FrameReady( TextureSet textureSet );
+ void FrameReady( TextureSet textureSet )
override
;
/**
* Display the next frame. It is called when the mFrameDelayTimer ticks.
/**
* Display the next frame. It is called when the mFrameDelayTimer ticks.