From: Joogab Yun Date: Tue, 12 Feb 2019 07:09:14 +0000 (+0900) Subject: Merge branch 'devel/master' into tizen X-Git-Tag: accepted/tizen/unified/20190213.071847~1 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git;a=commitdiff_plain;h=674ca26271878afcccac36be83013d367eded890;hp=12d0bd6c5e542c142768d8a4a720396a785ee498 Merge branch 'devel/master' into tizen --- diff --git a/build/tizen/adaptor/Makefile.am b/build/tizen/adaptor/Makefile.am index 9ab4793..4cbd85e 100644 --- a/build/tizen/adaptor/Makefile.am +++ b/build/tizen/adaptor/Makefile.am @@ -499,34 +499,26 @@ LIBDALI_ADAPTOR_LA_CXXFLAGS += $(CAPI_APPFW_APPLICATION_CFLAGS) \ $(CAPI_SYSTEM_SYSTEM_SETTINGS_CFLAGS) \ $(CAPI_SYSTEM_INFO_CFLAGS) \ $(TTS_CFLAGS) \ - $(SENSOR_CFLAGS) - -LIBDALI_ADAPTOR_LA_LIBADD += $(CAPI_APPFW_APPLICATION_LIBS) \ - $(CAPI_SYSTEM_SYSTEM_SETTINGS_LIBS) \ - $(CAPI_SYSTEM_INFO_LIBS) \ - $(TTS_LIBS) \ - $(SENSOR_LIBS) -if USE_APPFW_EFL_BASE -LIBDALI_ADAPTOR_LA_CXXFLAGS += $(ELEMENTARY_CFLAGS) - -LIBDALI_ADAPTOR_LA_LIBADD += $(ELEMENTARY_LIBS) - -else -LIBDALI_ADAPTOR_LA_CXXFLAGS += $(BUNDLE_CFLAGS) \ + $(SENSOR_CFLAGS) \ + $(BUNDLE_CFLAGS) \ $(CAPI_APPFW_COMMON_CFLAGS) \ $(CAPI_APPFW_CONTROL_CFLAGS) \ $(CAPI_APPFW_WIDGET_BASE_CFLAGS) \ $(ECORE_IMF_CFLAGS) \ - $(FRIBIDI_CFLAGS) \ - -DWIDGET_SUPPOERTED + $(FRIBIDI_CFLAGS) -LIBDALI_ADAPTOR_LA_LIBADD += $(BUNDLE_LIBS) \ +LIBDALI_ADAPTOR_LA_LIBADD += $(CAPI_APPFW_APPLICATION_LIBS) \ + $(CAPI_SYSTEM_SYSTEM_SETTINGS_LIBS) \ + $(CAPI_SYSTEM_INFO_LIBS) \ + $(TTS_LIBS) \ + $(SENSOR_LIBS) \ + $(BUNDLE_LIBS) \ $(CAPI_APPFW_COMMON_LIBS) \ $(CAPI_APPFW_CONTROL_LIBS) \ $(CAPI_APPFW_WIDGET_BASE_LIBS) \ $(ECORE_IMF_LIBS) \ $(FRIBIDI_LIBS) -endif + else LIBDALI_ADAPTOR_LA_CXXFLAGS += $(ELEMENTARY_CFLAGS) diff --git a/build/tizen/adaptor/configure.ac b/build/tizen/adaptor/configure.ac index 11a6816..ea05c8b 100644 --- a/build/tizen/adaptor/configure.ac +++ b/build/tizen/adaptor/configure.ac @@ -208,7 +208,6 @@ AM_CONDITIONAL([UBUNTU_PROFILE], [test x$enable_profile = xUBUNTU]) AM_CONDITIONAL([WAYLAND], [test x$enable_wayland = xyes]) AM_CONDITIONAL([ECORE_WAYLAND2], [test x$enable_ecore_wayland2 = xyes]) AM_CONDITIONAL([USE_APPFW], [test x$enable_appfw = xyes]) -AM_CONDITIONAL([USE_APPFW_EFL_BASE], [test x$enable_tizen_major_version = x3]) AM_CONDITIONAL([ENABLE_CXX03_ABI], [test x$enable_cxx03_abi = xyes]) AM_CONDITIONAL([ENABLE_RENAME_SO], [test x$enable_rename_so = xyes]) diff --git a/dali/devel-api/adaptor-framework/image-loading.cpp b/dali/devel-api/adaptor-framework/image-loading.cpp index af05256..aed3189 100644 --- a/dali/devel-api/adaptor-framework/image-loading.cpp +++ b/dali/devel-api/adaptor-framework/image-loading.cpp @@ -67,6 +67,10 @@ ImageDimensions GetClosestImageSize( const std::string& filename, return dimension; } +ImageDimensions GetOriginalImageSize( const std::string& filename ) +{ + return TizenPlatform::ImageLoader::GetClosestImageSize( filename, ImageDimensions(0, 0), FittingMode::DEFAULT, SamplingMode::BOX_THEN_LINEAR, true ); +} Devel::PixelBuffer DownloadImageSynchronously( const std::string& url, ImageDimensions size, FittingMode::Type fittingMode, SamplingMode::Type samplingMode, bool orientationCorrection ) { diff --git a/dali/devel-api/adaptor-framework/image-loading.h b/dali/devel-api/adaptor-framework/image-loading.h index a7995ba..7230a19 100755 --- a/dali/devel-api/adaptor-framework/image-loading.h +++ b/dali/devel-api/adaptor-framework/image-loading.h @@ -72,6 +72,15 @@ DALI_ADAPTOR_API ImageDimensions GetClosestImageSize( bool orientationCorrection = true ); /** + * @brief Get the size of an original image + * @param[in] filename name of the image. + * + * @return dimensions to original image + */ +DALI_ADAPTOR_API ImageDimensions GetOriginalImageSize( + const std::string& filename); + +/** * @brief Load an image synchronously from a remote resource. * * @param [in] url The URL of the image file to load. diff --git a/dali/devel-api/adaptor-framework/vector-animation-renderer-plugin.h b/dali/devel-api/adaptor-framework/vector-animation-renderer-plugin.h index bb4ef85..61544ca 100644 --- a/dali/devel-api/adaptor-framework/vector-animation-renderer-plugin.h +++ b/dali/devel-api/adaptor-framework/vector-animation-renderer-plugin.h @@ -45,15 +45,18 @@ public: virtual ~VectorAnimationRendererPlugin() {} /** - * @brief Creates a renderer to render an vector animation file. + * @brief Sets the url of the animation file. * - * @param[in] url The url of an animation file - * @param[in] renderer The renderer used to render the image - * @param[in] width The target image width - * @param[in] height The target image height - * @return True if the renderer is successfully created, false otherwise + * @param[in] url The url of the animation file + */ + virtual void SetUrl( const std::string& url ) = 0; + + /** + * @brief Sets the renderer used to display the result image. + * + * @param[in] renderer The renderer used to display the result image */ - virtual bool CreateRenderer( const std::string& url, Renderer renderer, uint32_t width, uint32_t height ) = 0; + virtual void SetRenderer( Renderer renderer ) = 0; /** * @brief Sets the target image size. diff --git a/dali/devel-api/adaptor-framework/vector-animation-renderer.cpp b/dali/devel-api/adaptor-framework/vector-animation-renderer.cpp index 8daaba2..b1b9e74 100755 --- a/dali/devel-api/adaptor-framework/vector-animation-renderer.cpp +++ b/dali/devel-api/adaptor-framework/vector-animation-renderer.cpp @@ -24,12 +24,12 @@ namespace Dali { -VectorAnimationRenderer VectorAnimationRenderer::New( const std::string& url, Renderer renderer, uint32_t width, uint32_t height ) +VectorAnimationRenderer VectorAnimationRenderer::New( const std::string& url ) { Internal::Adaptor::VectorAnimationRendererPtr animationRenderer = Internal::Adaptor::VectorAnimationRenderer::New(); if( animationRenderer ) { - animationRenderer->Initialize( url, renderer, width, height ); + animationRenderer->Initialize( url ); } return VectorAnimationRenderer( animationRenderer.Get() ); @@ -59,6 +59,11 @@ VectorAnimationRenderer& VectorAnimationRenderer::operator=( const VectorAnimati return *this; } +void VectorAnimationRenderer::SetRenderer( Renderer renderer ) +{ + GetImplementation( *this ).SetRenderer( renderer ); +} + void VectorAnimationRenderer::SetSize( uint32_t width, uint32_t height ) { GetImplementation( *this ).SetSize( width, height ); diff --git a/dali/devel-api/adaptor-framework/vector-animation-renderer.h b/dali/devel-api/adaptor-framework/vector-animation-renderer.h index f769073..64603a5 100755 --- a/dali/devel-api/adaptor-framework/vector-animation-renderer.h +++ b/dali/devel-api/adaptor-framework/vector-animation-renderer.h @@ -51,12 +51,9 @@ public: * @brief Creates an initialized handle to a new VectorAnimationRenderer. * * @param[in] url The url of the vector animation file - * @param[in] renderer The renderer used to render the image - * @param[in] width The width of the content - * @param[in] height The height of the content * @return A handle to a newly allocated VectorAnimationRenderer */ - static VectorAnimationRenderer New( const std::string& url, Renderer renderer, uint32_t width, uint32_t height ); + static VectorAnimationRenderer New( const std::string& url ); /** * @brief Creates an empty handle. @@ -85,6 +82,13 @@ public: VectorAnimationRenderer& operator=( const VectorAnimationRenderer& rhs ); /** + * @brief Sets the renderer used to display the result image. + * + * @param[in] renderer The renderer used to display the result image + */ + void SetRenderer( Renderer renderer ); + + /** * @brief Sets the target image size. * * @param[in] width The target image width diff --git a/dali/integration-api/adaptor.h b/dali/integration-api/adaptor.h index 3b996b8..14ff203 100755 --- a/dali/integration-api/adaptor.h +++ b/dali/integration-api/adaptor.h @@ -24,6 +24,7 @@ #include #include #include +#include // INTERNAL INCLUDES #include @@ -370,6 +371,19 @@ public: */ const LogFactoryInterface& GetLogFactory(); + /** + * @brief Register a processor implementing the Integration::Processor interface with dali-core. + * @param[in] processor the Processor to register + * @note using this api does not maintain the processor's lifecycle, must be done elsewhere. + */ + void RegisterProcessor( Integration::Processor& processor ); + + /** + * @brief Unregister a previously registered processor from dali-core. + * @param[in] processor the Processor to unregister + */ + void UnregisterProcessor( Integration::Processor& processor ); + public: // Signals /** diff --git a/dali/internal/adaptor/common/adaptor-impl.cpp b/dali/internal/adaptor/common/adaptor-impl.cpp index d046790..73c18d8 100755 --- a/dali/internal/adaptor/common/adaptor-impl.cpp +++ b/dali/internal/adaptor/common/adaptor-impl.cpp @@ -30,6 +30,7 @@ #include #include #include +#include // INTERNAL INCLUDES #include @@ -938,6 +939,16 @@ const LogFactoryInterface& Adaptor::GetLogFactory() return *mEnvironmentOptions; } +void Adaptor::RegisterProcessor( Integration::Processor& processor ) +{ + GetCore().RegisterProcessor(processor); +} + +void Adaptor::UnregisterProcessor( Integration::Processor& processor ) +{ + GetCore().UnregisterProcessor(processor); +} + void Adaptor::RequestUpdateOnce() { if( mThreadController ) diff --git a/dali/internal/adaptor/common/adaptor-impl.h b/dali/internal/adaptor/common/adaptor-impl.h index d014622..af7eb87 100755 --- a/dali/internal/adaptor/common/adaptor-impl.h +++ b/dali/internal/adaptor/common/adaptor-impl.h @@ -56,6 +56,7 @@ namespace Integration { class Core; class GlAbstraction; +class Processor; } namespace Internal @@ -424,6 +425,16 @@ public: */ const LogFactoryInterface& GetLogFactory(); + /** + * @copydoc Dali::Adaptor::RegisterProcessor + */ + void RegisterProcessor( Integration::Processor& processor ); + + /** + * @coydoc Dali::Adaptor::UnregisterProcessor + */ + void UnregisterProcessor( Integration::Processor& processor ); + public: //AdaptorInternalServices /** diff --git a/dali/internal/adaptor/common/adaptor.cpp b/dali/internal/adaptor/common/adaptor.cpp index a0747df..377a031 100755 --- a/dali/internal/adaptor/common/adaptor.cpp +++ b/dali/internal/adaptor/common/adaptor.cpp @@ -193,6 +193,16 @@ const LogFactoryInterface& Adaptor::GetLogFactory() return mImpl->GetLogFactory(); } +void Adaptor::RegisterProcessor( Integration::Processor& processor ) +{ + mImpl->RegisterProcessor( processor ); +} + +void Adaptor::UnregisterProcessor( Integration::Processor& processor ) +{ + mImpl->UnregisterProcessor( processor ); +} + Adaptor::Adaptor() : mImpl( NULL ) { diff --git a/dali/internal/adaptor/tizen-wayland/tizen-wearable/watch-application-impl.cpp b/dali/internal/adaptor/tizen-wayland/tizen-wearable/watch-application-impl.cpp index 0ed2068..3ffd722 100644 --- a/dali/internal/adaptor/tizen-wayland/tizen-wearable/watch-application-impl.cpp +++ b/dali/internal/adaptor/tizen-wayland/tizen-wearable/watch-application-impl.cpp @@ -17,6 +17,7 @@ // CLASS HEADER #include +#include namespace Dali { @@ -27,6 +28,18 @@ namespace Internal namespace Adaptor { +namespace +{ + +unsigned int GetEnvWatchRenderRefreshRate() +{ + const char* envVariable = std::getenv( DALI_WATCH_REFRESH_RATE ); + + return envVariable ? std::atoi( envVariable ) : 2u; // Default 30 fps +} + +} // unnamed namespace + WatchApplicationPtr WatchApplication::New( int* argc, char **argv[], @@ -51,7 +64,7 @@ void WatchApplication::OnInit() { Application::OnInit(); - Dali::Adaptor::Get().SetRenderRefreshRate( 2 ); // make 30 fps for watch applications + Dali::Adaptor::Get().SetRenderRefreshRate( GetEnvWatchRenderRefreshRate() ); mState = INITIALIZED; } diff --git a/dali/internal/imaging/common/file-download.cpp b/dali/internal/imaging/common/file-download.cpp index b4d3f4f..60faf2c 100755 --- a/dali/internal/imaging/common/file-download.cpp +++ b/dali/internal/imaging/common/file-download.cpp @@ -43,6 +43,7 @@ namespace // unnamed namespace { const int CONNECTION_TIMEOUT_SECONDS( 30L ); +const int TIMEOUT_SECONDS( 120L ); const long VERBOSE_MODE = 0L; // 0 == off, 1 == on const long CLOSE_CONNECTION_ON_ERROR = 1L; // 0 == off, 1 == on const long EXCLUDE_HEADER = 0L; @@ -64,6 +65,7 @@ void ConfigureCurlOptions( CURL* curlHandle, const std::string& url ) // CURLOPT_FAILONERROR is not fail-safe especially when authentication is involved ( see manual ) // Removed CURLOPT_FAILONERROR option curl_easy_setopt( curlHandle, CURLOPT_CONNECTTIMEOUT, CONNECTION_TIMEOUT_SECONDS ); + curl_easy_setopt( curlHandle, CURLOPT_TIMEOUT, TIMEOUT_SECONDS ); curl_easy_setopt( curlHandle, CURLOPT_HEADER, INCLUDE_HEADER ); curl_easy_setopt( curlHandle, CURLOPT_NOBODY, EXCLUDE_BODY ); diff --git a/dali/internal/system/common/environment-variables.h b/dali/internal/system/common/environment-variables.h index cddaaa3..500dfa9 100644 --- a/dali/internal/system/common/environment-variables.h +++ b/dali/internal/system/common/environment-variables.h @@ -100,6 +100,10 @@ namespace Adaptor #define DALI_REFRESH_RATE "DALI_REFRESH_RATE" +#define DALI_WATCH_REFRESH_RATE "DALI_WATCH_REFRESH_RATE" + +#define DALI_WIDGET_REFRESH_RATE "DALI_WIDGET_REFRESH_RATE" + #define DALI_ENV_MULTI_SAMPLING_LEVEL "DALI_MULTI_SAMPLING_LEVEL" #define DALI_ENV_MAX_TEXTURE_SIZE "DALI_MAX_TEXTURE_SIZE" diff --git a/dali/internal/system/common/singleton-service-impl.cpp b/dali/internal/system/common/singleton-service-impl.cpp index cb7830b..b7c8769 100755 --- a/dali/internal/system/common/singleton-service-impl.cpp +++ b/dali/internal/system/common/singleton-service-impl.cpp @@ -22,6 +22,7 @@ #include #include #include +#include #include // INTERNAL INCLUDES diff --git a/dali/internal/system/tizen-wayland/widget-application-impl-tizen.cpp b/dali/internal/system/tizen-wayland/widget-application-impl-tizen.cpp index 7c12ef9..b9354c6 100644 --- a/dali/internal/system/tizen-wayland/widget-application-impl-tizen.cpp +++ b/dali/internal/system/tizen-wayland/widget-application-impl-tizen.cpp @@ -21,12 +21,12 @@ // INTERNAL INCLUDE #include #include +#include #include -#ifdef WIDGET_SUPPOERTED +// EXTERNAL INCLUDES #include #include -#endif namespace Dali { @@ -34,7 +34,6 @@ namespace Dali namespace Internal { -#ifdef WIDGET_SUPPOERTED namespace { @@ -192,15 +191,18 @@ int OnInstanceUpdate(widget_base_instance_h instanceHandle, bundle *content, int return 0; } -} // anonymous namespace +unsigned int GetEnvWidgetRenderRefreshRate() +{ + const char* envVariable = std::getenv( DALI_WIDGET_REFRESH_RATE ); -#endif + return envVariable ? std::atoi( envVariable ) : 1u; // Default 60 fps +} + +} // anonymous namespace namespace Adaptor { -#ifdef WIDGET_SUPPOERTED - WidgetApplicationPtr WidgetApplicationTizen::New( int* argc, char **argv[], @@ -282,7 +284,12 @@ void WidgetApplicationTizen::DeleteWidget( widget_base_instance_h widgetBaseInst } } -#endif +void WidgetApplicationTizen::OnInit() +{ + WidgetApplication::OnInit(); + + Dali::Adaptor::Get().SetRenderRefreshRate( GetEnvWidgetRenderRefreshRate() ); +} // factory function, must be implemented namespace WidgetApplicationFactory @@ -295,11 +302,7 @@ namespace WidgetApplicationFactory */ Dali::Internal::Adaptor::WidgetApplicationPtr Create( int* argc, char **argv[], const std::string& stylesheet ) { -#ifdef WIDGET_SUPPOERTED return WidgetApplicationTizen::New( argc, argv, stylesheet ); -#else - return nullptr; -#endif } } // namespace Factory diff --git a/dali/internal/system/tizen-wayland/widget-application-impl-tizen.h b/dali/internal/system/tizen-wayland/widget-application-impl-tizen.h index 96eaab6..9e94388 100644 --- a/dali/internal/system/tizen-wayland/widget-application-impl-tizen.h +++ b/dali/internal/system/tizen-wayland/widget-application-impl-tizen.h @@ -19,18 +19,12 @@ */ // EXTERNAL INCLUDES -#ifdef WIDGET_SUPPOERTED #include -#endif // INTERNAL INCLUDES #include #include -#ifndef WIDGET_SUPPOERTED -typedef void* widget_base_instance_h; -#endif - namespace Dali { class Widget; @@ -63,6 +57,10 @@ public: static WidgetApplicationPtr New( int* argc, char **argv[], const std::string& stylesheet ); public: + /** + * @copydoc Dali::Internal::Adaptor::Application::OnInit() + */ + virtual void OnInit(); /** * @copydoc Dali::WidgetApplication::RegisterWidgetCreator() diff --git a/dali/internal/system/tizen-wayland/widget-controller-tizen.h b/dali/internal/system/tizen-wayland/widget-controller-tizen.h index b692a9f..c9a58d4 100644 --- a/dali/internal/system/tizen-wayland/widget-controller-tizen.h +++ b/dali/internal/system/tizen-wayland/widget-controller-tizen.h @@ -20,11 +20,9 @@ // EXTERNAL INCLUDES #include +#include // INTERNAL INCLUDES -#ifdef WIDGET_SUPPOERTED -#include -#endif #include #include @@ -44,10 +42,6 @@ class WidgetImplTizen : public Widget::Impl { public: -#ifndef WIDGET_SUPPOERTED - typedef void* widget_base_instance_h; -#endif - /** * Constructor */ diff --git a/dali/internal/vector-animation/common/vector-animation-renderer-impl.cpp b/dali/internal/vector-animation/common/vector-animation-renderer-impl.cpp index f2e46e3..de8140d 100644 --- a/dali/internal/vector-animation/common/vector-animation-renderer-impl.cpp +++ b/dali/internal/vector-animation/common/vector-animation-renderer-impl.cpp @@ -60,9 +60,14 @@ VectorAnimationRenderer::~VectorAnimationRenderer() { } -void VectorAnimationRenderer::Initialize( const std::string& url, Dali::Renderer renderer, uint32_t width, uint32_t height ) +void VectorAnimationRenderer::Initialize( const std::string& url ) { - mPlugin.CreateRenderer( url, renderer, width, height ); + mPlugin.SetUrl( url ); +} + +void VectorAnimationRenderer::SetRenderer( Dali::Renderer renderer ) +{ + mPlugin.SetRenderer( renderer ); } void VectorAnimationRenderer::SetSize( uint32_t width, uint32_t height ) diff --git a/dali/internal/vector-animation/common/vector-animation-renderer-impl.h b/dali/internal/vector-animation/common/vector-animation-renderer-impl.h index 5e8e80d..a21cf7f 100755 --- a/dali/internal/vector-animation/common/vector-animation-renderer-impl.h +++ b/dali/internal/vector-animation/common/vector-animation-renderer-impl.h @@ -54,7 +54,12 @@ public: /** * @brief Initializes member data. */ - void Initialize( const std::string& url, Dali::Renderer renderer, uint32_t width, uint32_t height ); + void Initialize( const std::string& url ); + + /** + * @copydoc Dali::VectorAnimationRenderer::SetRenderer() + */ + void SetRenderer( Dali::Renderer renderer ); /** * @copydoc Dali::VectorAnimationRenderer::SetSize() diff --git a/dali/internal/vector-animation/common/vector-animation-renderer-plugin-proxy.cpp b/dali/internal/vector-animation/common/vector-animation-renderer-plugin-proxy.cpp index b213478..2860f42 100644 --- a/dali/internal/vector-animation/common/vector-animation-renderer-plugin-proxy.cpp +++ b/dali/internal/vector-animation/common/vector-animation-renderer-plugin-proxy.cpp @@ -100,13 +100,20 @@ void VectorAnimationRendererPluginProxy::Initialize() } } -bool VectorAnimationRendererPluginProxy::CreateRenderer( const std::string& url, Dali::Renderer renderer, uint32_t width, uint32_t height ) +void VectorAnimationRendererPluginProxy::SetUrl( const std::string& url ) { if( mPlugin ) { - return mPlugin->CreateRenderer( url, renderer, width, height ); + mPlugin->SetUrl( url ); + } +} + +void VectorAnimationRendererPluginProxy::SetRenderer( Dali::Renderer renderer ) +{ + if( mPlugin ) + { + mPlugin->SetRenderer( renderer ); } - return false; } void VectorAnimationRendererPluginProxy::SetSize( uint32_t width, uint32_t height ) diff --git a/dali/internal/vector-animation/common/vector-animation-renderer-plugin-proxy.h b/dali/internal/vector-animation/common/vector-animation-renderer-plugin-proxy.h index 2fc4e05..fe2f636 100644 --- a/dali/internal/vector-animation/common/vector-animation-renderer-plugin-proxy.h +++ b/dali/internal/vector-animation/common/vector-animation-renderer-plugin-proxy.h @@ -48,9 +48,14 @@ public: ~VectorAnimationRendererPluginProxy(); /** - * @copydoc Dali::VectorAnimationRendererPlugin::CreateRenderer() + * @copydoc Dali::VectorAnimationRendererPlugin::SetUrl() */ - bool CreateRenderer( const std::string& url, Dali::Renderer renderer, uint32_t width, uint32_t height ); + void SetUrl( const std::string& url ); + + /** + * @copydoc Dali::VectorAnimationRendererPlugin::SetRenderer() + */ + void SetRenderer( Dali::Renderer renderer ); /** * @copydoc Dali::VectorAnimationRendererPlugin::SetSize() diff --git a/dali/public-api/adaptor-framework/application.h b/dali/public-api/adaptor-framework/application.h index 96eaedf..e661684 100644 --- a/dali/public-api/adaptor-framework/application.h +++ b/dali/public-api/adaptor-framework/application.h @@ -321,38 +321,38 @@ public: public: // Stereoscopy /** + * @DEPRECATED_1_3_51 * @brief Sets the viewing mode for the application. * @SINCE_1_0.0 * @param[in] viewMode The new viewing mode - * @DEPRECATED_1_3.51 */ void SetViewMode( ViewMode viewMode ); /** + * @DEPRECATED_1_3_51 * @brief Gets the current viewing mode. * @SINCE_1_0.0 * @return The current viewing mode - * @DEPRECATED_1_3.51 */ ViewMode GetViewMode() const; /** + * @DEPRECATED_1_3_51 * @brief Sets the stereo base (eye separation) for Stereoscopic 3D. * * The stereo base is the distance in millimetres between the eyes. Typical values are * between 50mm and 70mm. The default value is 65mm. * @SINCE_1_0.0 * @param[in] stereoBase The stereo base (eye separation) for Stereoscopic 3D - * @DEPRECATED_1_3.51 */ void SetStereoBase( float stereoBase ); /** + * @DEPRECATED_1_3_51 * @brief Gets the stereo base (eye separation) for Stereoscopic 3D. * * @SINCE_1_0.0 * @return The stereo base (eye separation) for Stereoscopic 3D - * @DEPRECATED_1_3.51 */ float GetStereoBase() const; @@ -398,7 +398,7 @@ public: // Signals AppSignalType& ResetSignal(); /** - * @DEPRECATED_1_1.43 Use Window::ResizedSignal() instead. + * @DEPRECATED_1_4.6 Use Window::ResizedSignal() instead. * @brief This signal is emitted when the window application rendering on is resized. * @SINCE_1_0.0 * @return The signal to connect to diff --git a/dali/public-api/dali-adaptor-version.cpp b/dali/public-api/dali-adaptor-version.cpp index 44a7fff..addaf93 100644 --- a/dali/public-api/dali-adaptor-version.cpp +++ b/dali/public-api/dali-adaptor-version.cpp @@ -28,7 +28,7 @@ namespace Dali const unsigned int ADAPTOR_MAJOR_VERSION = 1; const unsigned int ADAPTOR_MINOR_VERSION = 4; -const unsigned int ADAPTOR_MICRO_VERSION = 4; +const unsigned int ADAPTOR_MICRO_VERSION = 6; const char * const ADAPTOR_BUILD_DATE = __DATE__ " " __TIME__; #ifdef DEBUG_ENABLED diff --git a/packaging/dali-adaptor.spec b/packaging/dali-adaptor.spec index e0c9305..95b8bb6 100644 --- a/packaging/dali-adaptor.spec +++ b/packaging/dali-adaptor.spec @@ -19,7 +19,7 @@ Name: dali-adaptor Summary: The DALi Tizen Adaptor -Version: 1.4.4 +Version: 1.4.6 Release: 1 Group: System/Libraries License: Apache-2.0 and BSD-3-Clause and MIT