From a5ace36b92903cc56f312735ed820d157da957f5 Mon Sep 17 00:00:00 2001 From: Seoyeon Kim Date: Wed, 4 Jan 2017 14:30:58 +0900 Subject: [PATCH] Revert "[Tizen] Deprecate the public APIs taking Image Handle as input" This reverts commit 415171d54ef044102b87709d18088fa80799faf2. Change-Id: I86e30b2f79302535746091cc049e3d527b3289a6 --- dali-toolkit/public-api/controls/control.h | 2 +- dali-toolkit/public-api/controls/image-view/image-view.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dali-toolkit/public-api/controls/control.h b/dali-toolkit/public-api/controls/control.h index 569a030..86ea607 100644 --- a/dali-toolkit/public-api/controls/control.h +++ b/dali-toolkit/public-api/controls/control.h @@ -329,7 +329,7 @@ public: Vector4 GetBackgroundColor() const; /** - * @DEPRECATED_1_2_8, use Property::BACKGROUND instead + * @DEPRECATED_1_2.8, use Property::BACKGROUND instead * * @brief Sets an image as the background of the control. * diff --git a/dali-toolkit/public-api/controls/image-view/image-view.h b/dali-toolkit/public-api/controls/image-view/image-view.h index 3f1b32d..4585657 100644 --- a/dali-toolkit/public-api/controls/image-view/image-view.h +++ b/dali-toolkit/public-api/controls/image-view/image-view.h @@ -125,7 +125,7 @@ public: static ImageView New(); /** - * @DEPRECATED_1_2_8, use New( const std::string& ) instead. + * @DEPRECATED_1_2.8, use New( const std::string& ) instead. * * @brief Create an initialized ImageView from an Image instance. * @@ -206,7 +206,7 @@ public: static ImageView DownCast( BaseHandle handle ); /** - * @DEPRECATED_1_2_8, use SetImage( const std::string& ) instead. + * @DEPRECATED_1_2.8, use SetImage( const std::string& ) instead. * * @brief Sets this ImageView from an Image instance. * -- 2.7.4