From 523d1adcca401797a6a15554a3b5fb43aaae64b0 Mon Sep 17 00:00:00 2001 From: JunsuChoi Date: Mon, 7 Dec 2020 16:23:57 +0900 Subject: [PATCH] VectorImageRendererPlugin: Remove unnecessary parameter TizenVectorImageRenderer, which implements VectorImageRendererPlugin, supports size API. Therefore, if there are width and height, scaling is unnecessary. Change-Id: I010036600a724810853a8805c88bd59bcd00a3d5 --- dali/devel-api/adaptor-framework/vector-image-renderer-plugin.h | 3 +-- dali/internal/vector-image/common/vector-image-renderer-impl.cpp | 2 +- .../vector-image/common/vector-image-renderer-plugin-proxy.cpp | 4 ++-- .../internal/vector-image/common/vector-image-renderer-plugin-proxy.h | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dali/devel-api/adaptor-framework/vector-image-renderer-plugin.h b/dali/devel-api/adaptor-framework/vector-image-renderer-plugin.h index 1709bdb..7e0f8f8 100644 --- a/dali/devel-api/adaptor-framework/vector-image-renderer-plugin.h +++ b/dali/devel-api/adaptor-framework/vector-image-renderer-plugin.h @@ -54,10 +54,9 @@ public: * @brief Rasterizes the content to the target buffer synchronously. * * @param[in] buffer The target buffer - * @param[in] scale The target image scale * @return True if the rendering succeeds, false otherwise. */ - virtual bool Rasterize(Dali::Devel::PixelBuffer &buffer, float scale) = 0; + virtual bool Rasterize(Dali::Devel::PixelBuffer &buffer) = 0; /** * @brief Gets the default size of the file. diff --git a/dali/internal/vector-image/common/vector-image-renderer-impl.cpp b/dali/internal/vector-image/common/vector-image-renderer-impl.cpp index 1b5974e..9f6daaa 100644 --- a/dali/internal/vector-image/common/vector-image-renderer-impl.cpp +++ b/dali/internal/vector-image/common/vector-image-renderer-impl.cpp @@ -109,7 +109,7 @@ bool VectorImageRenderer::Rasterize(Dali::Devel::PixelBuffer& buffer, float scal { if(mPlugin.IsValid()) { - return mPlugin.Rasterize(buffer, scale); + return mPlugin.Rasterize(buffer); } else { diff --git a/dali/internal/vector-image/common/vector-image-renderer-plugin-proxy.cpp b/dali/internal/vector-image/common/vector-image-renderer-plugin-proxy.cpp index 86af7ae..d136f14 100644 --- a/dali/internal/vector-image/common/vector-image-renderer-plugin-proxy.cpp +++ b/dali/internal/vector-image/common/vector-image-renderer-plugin-proxy.cpp @@ -110,11 +110,11 @@ bool VectorImageRendererPluginProxy::Load(const Vector& data) return false; } -bool VectorImageRendererPluginProxy::Rasterize(Dali::Devel::PixelBuffer& buffer, float scale) +bool VectorImageRendererPluginProxy::Rasterize(Dali::Devel::PixelBuffer& buffer) { if( mPlugin ) { - return mPlugin->Rasterize(buffer, scale); + return mPlugin->Rasterize(buffer); } return false; } diff --git a/dali/internal/vector-image/common/vector-image-renderer-plugin-proxy.h b/dali/internal/vector-image/common/vector-image-renderer-plugin-proxy.h index b13b6c0..25d4c42 100644 --- a/dali/internal/vector-image/common/vector-image-renderer-plugin-proxy.h +++ b/dali/internal/vector-image/common/vector-image-renderer-plugin-proxy.h @@ -62,7 +62,7 @@ public: /** * @copydoc Dali::VectorImageRendererPlugin::Rasterize() */ - bool Rasterize(Dali::Devel::PixelBuffer& buffer, float scale); + bool Rasterize(Dali::Devel::PixelBuffer& buffer); /** * @copydoc Dali::VectorImageRendererPlugin::GetDefaultSize() -- 2.7.4