[3.0] Mark Clipping API as being part of the Tizen 3 version

[platform/core/uifw/dali-core.git] / dali / internal / event / actors / image-actor-impl.h

diff --git a/dali/internal/event/actors/image-actor-impl.h b/dali/internal/event/actors/image-actor-impl.h
index 9ca11ee..cd2ebe3 100644 (file)
--- a/dali/internal/event/actors/image-actor-impl.h
+++ b/dali/internal/event/actors/image-actor-impl.h
@@ -27,6 +27,7 @@
 #include <dali/internal/event/animation/animation-impl.h>
 #include <dali/internal/event/effects/shader-effect-impl.h>
 #include <dali/internal/event/images/nine-patch-image-impl.h>
+#include <dali/internal/event/rendering/texture-set-impl.h>
 
 namespace Dali
 {
@@ -37,17 +38,7 @@ namespace Internal
 class Image;
 
 /**
- * An actor which displays an Image object.
- *
- * This handles image fade-in if required, waiting for the image to load.
- *
- * If a new image is set on the actor, then this ensures that the old image
- * is displayed until the new image is ready to render to prevent flashing
- * to the actor color. This will also happen if the image is reloaded.
- *
- * This is achieved by using two connector objects to Image: mImageNext and
- * mImageAttachment's member object. The first one points to the Image object that is going to
- * be displayed next, the second one to the Image that is currently being displayed.
+ * An actor which displays an Image.
  */
 class ImageActor : public Actor
 {
@@ -73,7 +64,7 @@ public:
   void SetImage( ImagePtr& image );
 
   /**
-   * Retrieve the image rendered by the actor's attachment.
+   * Retrieve the image rendered by the actor.
    * @return smart pointer to the image or an empty one if no image is assigned
    */
   ImagePtr GetImage() const;
@@ -323,8 +314,6 @@ private:
   Vector2                 mActorSize;               ///< The actor size
   Uint16Pair              mGridSize;                ///< The geometry grid size
   int                     mRendererIndex;           ///< The index location of mRenderer
-  size_t                  mTextureIndex;            ///< The texture index for this ImageActor's texture
-  size_t                  mEffectTextureIndex;      ///< The texture index for this ImageActor's effect texture
   FilterMode::Type        mMinFilter;               ///< The minification filter currently set
   FilterMode::Type        mMagFilter;               ///< The magnification filter currently set
   Dali::ImageActor::Style mStyle;                   ///< The style set by SetStyle. Not used internally, only used to store what is set so it can be returned for backwards compatibility.