X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fimage%2Fimage-visual.h;h=bc94ffb63b71a6d2a209c28c776248b6869215c0;hb=57f2c014e61cff22236c0459757c41134fc7785f;hp=c0a3f750ae71baa5d0f194eac952675533f443a0;hpb=8d0ccc12714da58e6e2c971188b221ed2158d658;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/visuals/image/image-visual.h b/dali-toolkit/internal/visuals/image/image-visual.h index c0a3f75..bc94ffb 100644 --- a/dali-toolkit/internal/visuals/image/image-visual.h +++ b/dali-toolkit/internal/visuals/image/image-visual.h @@ -171,7 +171,7 @@ public: // from Visual /** * @copydoc Visual::Base::OnDoAction */ - void OnDoAction(const Dali::Property::Index actionName, const Dali::Property::Value& attributes) override; + void OnDoAction(const Dali::Property::Index actionId, const Dali::Property::Value& attributes) override; protected: /** @@ -248,25 +248,15 @@ public: void UploadCompleted() override; /** - * @copydoc TextureUploadObserver::UploadCompleted + * @copydoc TextureUploadObserver::LoadCompleted * * To avoid rendering garbage pixels, renderer should be added to actor after the resources are ready. * This callback is the place to add the renderer as it would be called once the loading is finished. */ - void UploadComplete(bool success, int32_t textureId, TextureSet textureSet, bool usingAtlas, const Vector4& atlasRectangle, bool preMultiplied) override; + void LoadComplete(bool success, TextureInformation textureInformation) override; private: /** - * @copydoc TextureUploadObserver::LoadComplete - * - * To avoid rendering garbage pixels, renderer should be added to actor after the resources are ready. - * This callback is the place to add the renderer as it would be called once the PixelBuffer loading is finished. - */ - void LoadComplete(bool loadSuccess, Devel::PixelBuffer pixelBuffer, const VisualUrl& url, bool preMultiplied) override - { - } - - /** * Allocate the mask data when a masking property is defined in the property map */ void AllocateMaskData();