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
Add null check for mTextureSet.
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
filters
/
spread-filter.h
diff --git
a/dali-toolkit/internal/filters/spread-filter.h
b/dali-toolkit/internal/filters/spread-filter.h
index
bc498de
..
926c98d
100644
(file)
--- a/
dali-toolkit/internal/filters/spread-filter.h
+++ b/
dali-toolkit/internal/filters/spread-filter.h
@@
-20,7
+20,6
@@
// EXTERNAL INCLUDES
#include <dali/public-api/render-tasks/render-task.h>
// EXTERNAL INCLUDES
#include <dali/public-api/render-tasks/render-task.h>
-#include <dali-toolkit/public-api/controls/image-view/image-view.h>
// INTERNAL INCLUDES
#include "image-filter.h"
// INTERNAL INCLUDES
#include "image-filter.h"
@@
-58,16
+57,16
@@
public:
public: // From ImageFilter
/// @copydoc Dali::Toolkit::Internal::ImageFilter::Enable
public: // From ImageFilter
/// @copydoc Dali::Toolkit::Internal::ImageFilter::Enable
- v
irtual void Enable()
;
+ v
oid Enable() override
;
/// @copydoc Dali::Toolkit::Internal::ImageFilter::Disable
/// @copydoc Dali::Toolkit::Internal::ImageFilter::Disable
- v
irtual void Disable()
;
+ v
oid Disable() override
;
/// @copydoc Dali::Toolkit::Internal::ImageFilter::Refresh
/// @copydoc Dali::Toolkit::Internal::ImageFilter::Refresh
- v
irtual void Refresh()
;
+ v
oid Refresh() override
;
/// @copydoc Dali::Toolkit::Internal::ImageFilter::SetSize
/// @copydoc Dali::Toolkit::Internal::ImageFilter::SetSize
- v
irtual void SetSize( const Vector2& size )
;
+ v
oid SetSize( const Vector2& size ) override
;
private:
private:
@@
-82,14
+81,14
@@
private:
private: // Attributes
private: // Attributes
- // To perform horizontal spread from mInput
Image to mImage
ForHorz
+ // To perform horizontal spread from mInput
Texture to mFrameBuffer
ForHorz
RenderTask mRenderTaskForHorz;
RenderTask mRenderTaskForHorz;
-
Toolkit::ImageView
mActorForInput;
- FrameBuffer
Image mImage
ForHorz;
+
Actor
mActorForInput;
+ FrameBuffer
mFrameBuffer
ForHorz;
- // To perform vertical spread from m
ImageForHorz to mOutputImage
+ // To perform vertical spread from m
FrameBufferForHorz to mOutputFrameBuffer
RenderTask mRenderTaskForVert;
RenderTask mRenderTaskForVert;
-
Toolkit::ImageView
mActorForHorz;
+
Actor
mActorForHorz;
int mSpread;
}; // class SpreadFilter
int mSpread;
}; // class SpreadFilter