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
/
image-filter.h
diff --git
a/dali-toolkit/internal/filters/image-filter.h
b/dali-toolkit/internal/filters/image-filter.h
index
dbab5b1
..
d73f9e6
100644
(file)
--- a/
dali-toolkit/internal/filters/image-filter.h
+++ b/
dali-toolkit/internal/filters/image-filter.h
@@
-20,6
+20,8
@@
// EXTERNAL INCLUDES
#include <dali/public-api/actors/camera-actor.h>
// EXTERNAL INCLUDES
#include <dali/public-api/actors/camera-actor.h>
+#include <dali/public-api/rendering/frame-buffer.h>
+#include <dali/public-api/rendering/texture.h>
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/controls/control-impl.h>
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/controls/control-impl.h>
@@
-36,7
+38,7
@@
namespace Internal
/**
* An interface class that provides a interface for image filters that perform
/**
* An interface class that provides a interface for image filters that perform
- * a simple shader effect on an input
image, rendering the output to a FrameBufferImage
.
+ * a simple shader effect on an input
texture, rendering the output to a FrameBuffer
.
*/
class ImageFilter
{
*/
class ImageFilter
{
@@
-76,16
+78,16
@@
public:
void SetRefreshOnDemand( bool onDemand );
/**
void SetRefreshOnDemand( bool onDemand );
/**
- * Set the input
imag
e
- * @param[in] The input/original
imag
e.
+ * Set the input
textur
e
+ * @param[in] The input/original
textur
e.
*/
*/
- void SetInput
Image( Image imag
e );
+ void SetInput
Texture( Texture textur
e );
/**
/**
- * Set the output
image
- * @return The output
image
.
+ * Set the output
frame buffer
+ * @return The output
frame buffer
.
*/
*/
- void SetOutput
Image( FrameBufferImage image
);
+ void SetOutput
FrameBuffer( FrameBuffer frameBuffer
);
/**
* Set size of ImageFilter. Used to create internal offscreen buffers
/**
* Set size of ImageFilter. Used to create internal offscreen buffers
@@
-145,8
+147,8
@@
protected:
void SetupCamera();
protected:
void SetupCamera();
protected:
-
Image mInputImag
e;
- FrameBuffer
Image mOutputImage
;
+
Texture mInputTextur
e;
+ FrameBuffer
mOutputFrameBuffer
;
FilterKernel mKernel;
Actor mRootActor;
CameraActor mCameraActor;
FilterKernel mKernel;
Actor mRootActor;
CameraActor mCameraActor;