From: Adeel Kazmi <adeel.kazmi@samsung.com>
Date: Fri, 18 Dec 2020 11:48:20 +0000 (+0000)
Subject: Merge "DALi Version 2.0.6" into devel/master
X-Git-Tag: dali_2.0.7~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=450ac0765c3ebdfe76c5231f5ee57a9c1db5bb18;hp=50d6fb11685e847db46c6803d4e37e63fbff7f99;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git

Merge "DALi Version 2.0.6" into devel/master
---

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<uint8_t>& 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()