From ea35fa06c7b4f6982d593e2b20b4d215239a014b Mon Sep 17 00:00:00 2001 From: Heeyong Song Date: Wed, 31 Jul 2019 12:55:05 +0900 Subject: [PATCH] (Vector) Change return type of Render() Change-Id: Iec238fa707428072ace4f063dba539bfa86b16cf --- .../devel-api/adaptor-framework/vector-animation-renderer-plugin.h | 5 +++-- dali/devel-api/adaptor-framework/vector-animation-renderer.cpp | 6 +++--- dali/devel-api/adaptor-framework/vector-animation-renderer.h | 5 +++-- .../vector-animation/common/vector-animation-renderer-impl.cpp | 6 +++--- .../vector-animation/common/vector-animation-renderer-impl.h | 4 ++-- .../common/vector-animation-renderer-plugin-proxy.cpp | 7 ++++--- .../common/vector-animation-renderer-plugin-proxy.h | 4 ++-- 7 files changed, 20 insertions(+), 17 deletions(-) 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 a9f25c6..122f8f1 100644 --- a/dali/devel-api/adaptor-framework/vector-animation-renderer-plugin.h +++ b/dali/devel-api/adaptor-framework/vector-animation-renderer-plugin.h @@ -2,7 +2,7 @@ #define DALI_VECTOR_ANIMATION_RENDERER_PLUGIN_H /* - * Copyright (c) 2018 Samsung Electronics Co., Ltd. + * Copyright (c) 2019 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -75,8 +75,9 @@ public: * @brief Renders the content to the target buffer synchronously. * * @param[in] frameNumber The frame number to be rendered + * @return True if the rendering success, false otherwise. */ - virtual void Render( uint32_t frameNumber ) = 0; + virtual bool Render( uint32_t frameNumber ) = 0; /** * @brief Gets the total number of frames of the file. diff --git a/dali/devel-api/adaptor-framework/vector-animation-renderer.cpp b/dali/devel-api/adaptor-framework/vector-animation-renderer.cpp index e7f8129..33609c0 100755 --- a/dali/devel-api/adaptor-framework/vector-animation-renderer.cpp +++ b/dali/devel-api/adaptor-framework/vector-animation-renderer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 Samsung Electronics Co., Ltd. + * Copyright (c) 2019 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -74,9 +74,9 @@ void VectorAnimationRenderer::StopRender() GetImplementation( *this ).StopRender(); } -void VectorAnimationRenderer::Render( uint32_t frameNumber ) +bool VectorAnimationRenderer::Render( uint32_t frameNumber ) { - GetImplementation( *this ).Render( frameNumber ); + return GetImplementation( *this ).Render( frameNumber ); } uint32_t VectorAnimationRenderer::GetTotalFrameNumber() const diff --git a/dali/devel-api/adaptor-framework/vector-animation-renderer.h b/dali/devel-api/adaptor-framework/vector-animation-renderer.h index abb911e..58ff243 100755 --- a/dali/devel-api/adaptor-framework/vector-animation-renderer.h +++ b/dali/devel-api/adaptor-framework/vector-animation-renderer.h @@ -2,7 +2,7 @@ #define DALI_VECTOR_ANIMATION_RENDERER_H /* - * Copyright (c) 2018 Samsung Electronics Co., Ltd. + * Copyright (c) 2019 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -105,8 +105,9 @@ public: * @brief Renders the content to the target buffer synchronously. * * @param[in] frameNumber The frame number to be rendered + * @return True if the rendering success, false otherwise. */ - void Render( uint32_t frameNumber ); + bool Render( uint32_t frameNumber ); /** * @brief Gets the total number of frames of the file 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 3f1d9ea..2e09da8 100644 --- a/dali/internal/vector-animation/common/vector-animation-renderer-impl.cpp +++ b/dali/internal/vector-animation/common/vector-animation-renderer-impl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 Samsung Electronics Co., Ltd. + * Copyright (c) 2019 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -80,9 +80,9 @@ void VectorAnimationRenderer::StopRender() mPlugin.StopRender(); } -void VectorAnimationRenderer::Render( uint32_t frameNumber ) +bool VectorAnimationRenderer::Render( uint32_t frameNumber ) { - mPlugin.Render( frameNumber ); + return mPlugin.Render( frameNumber ); } uint32_t VectorAnimationRenderer::GetTotalFrameNumber() const 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 56ab9b2..b530e4a 100755 --- a/dali/internal/vector-animation/common/vector-animation-renderer-impl.h +++ b/dali/internal/vector-animation/common/vector-animation-renderer-impl.h @@ -2,7 +2,7 @@ #define DALI_INTERNAL_VECTOR_ANIMATION_RENDERER_IMPL_H /* - * Copyright (c) 2018 Samsung Electronics Co., Ltd. + * Copyright (c) 2019 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -74,7 +74,7 @@ public: /** * @copydoc Dali::VectorAnimationRenderer::Render() */ - void Render( uint32_t frameNumber ); + bool Render( uint32_t frameNumber ); /** * @copydoc Dali::VectorAnimationRenderer::GetTotalFrameNumber() 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 dff90c3..fca9eb2 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 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 Samsung Electronics Co., Ltd. + * Copyright (c) 2019 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -133,12 +133,13 @@ void VectorAnimationRendererPluginProxy::StopRender() } } -void VectorAnimationRendererPluginProxy::Render( uint32_t frameNumber ) +bool VectorAnimationRendererPluginProxy::Render( uint32_t frameNumber ) { if( mPlugin ) { - mPlugin->Render( frameNumber ); + return mPlugin->Render( frameNumber ); } + return false; } uint32_t VectorAnimationRendererPluginProxy::GetTotalFrameNumber() const 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 119c0c4..e6f1e5b 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 @@ -2,7 +2,7 @@ #define DALI_INTERNAL_VECTOR_ANIMATION_RENDERER_PLUGIN_PROXY_H /* - * Copyright (c) 2018 Samsung Electronics Co., Ltd. + * Copyright (c) 2019 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -70,7 +70,7 @@ public: /** * @copydoc Dali::VectorAnimationRendererPlugin::Render() */ - void Render( uint32_t frameNumber ); + bool Render( uint32_t frameNumber ); /** * @copydoc Dali::VectorAnimationRendererPlugin::GetTotalFrameNumber() -- 2.7.4