Remove vector image renderer plugin 50/275850/1
authorHeeyong Song <heeyong.song@samsung.com>
Fri, 3 Jun 2022 04:13:11 +0000 (13:13 +0900)
committerHeeyong Song <heeyong.song@samsung.com>
Fri, 3 Jun 2022 04:13:11 +0000 (13:13 +0900)
It moved to dali-adaptor.

Change-Id: I5aa55eb7d6777bdd1a7d1e085448ca7dc7e6ecf3

build/tizen/configure.ac
build/tizen/vector-image-renderer/Makefile.am [deleted file]
build/tizen/vector-image-renderer/configure.ac [deleted file]
dali-extension/vector-image-renderer/file.list [deleted file]
dali-extension/vector-image-renderer/tizen-vector-image-renderer.cpp [deleted file]
dali-extension/vector-image-renderer/tizen-vector-image-renderer.h [deleted file]
packaging/dali-extension.spec

index d509216..066b26e 100755 (executable)
@@ -49,7 +49,6 @@ fi
 
 if test "x$with_tizen_65_or_greater" = "xyes"; then
   AC_CONFIG_SUBDIRS(camera-player)
-  AC_CONFIG_SUBDIRS(vector-image-renderer)
   AC_CONFIG_SUBDIRS(rive-animation-view)
 fi
 
diff --git a/build/tizen/vector-image-renderer/Makefile.am b/build/tizen/vector-image-renderer/Makefile.am
deleted file mode 100644 (file)
index 6a533fe..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# Copyright (c) 2020 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.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# Build the Dali vector image renderer plugin
-
-extension_src_dir = ../../../dali-extension
-
-include ../../../dali-extension/vector-image-renderer/file.list
-
-lib_LTLIBRARIES =
-
-lib_LTLIBRARIES += libdali2-vector-image-renderer-plugin.la
-
-libdali2_vector_image_renderer_plugin_la_SOURCES = \
-                     $(vector_image_renderer_plugin_src_files)
-
-libdali2_vector_image_renderer_plugin_la_DEPENDENCIES =
-
-libdali2_vector_image_renderer_plugin_la_CXXFLAGS = \
-                      -I../../../ \
-                      $(DALI_CFLAGS) \
-                      $(THORVG_CFLAGS) \
-                      -Werror -Wall
-
-libdali2_vector_image_renderer_plugin_la_LIBADD = \
-                      $(DALI_LIBS) \
-                      $(THORVG_LIBS)
-
-libdali2_vector_image_renderer_plugin_la_LDFLAGS = \
-                      -rdynamic
-
diff --git a/build/tizen/vector-image-renderer/configure.ac b/build/tizen/vector-image-renderer/configure.ac
deleted file mode 100644 (file)
index c99ac7f..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-4_define([dali_version],[0.1.0])
-AC_INIT([dali], [dali_version])
-AM_INIT_AUTOMAKE([-Wall foreign])
-
-AC_CONFIG_MACRO_DIRS([m4 ../m4])
-
-AC_PROG_CXX
-AC_PROG_LIBTOOL
-
-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
-
-AX_CXX_COMPILE_STDCXX([17], [noext], [mandatory])
-
-LT_INIT
-
-DALI_EXTENSION_VERSION=dali_version
-AC_SUBST(DALI_EXTENSION_VERSION)
-
-if test "x$enable_debug" = "xyes"; then
-  DALI_CFLAGS="$DALI_CFLAGS -DDEBUG_ENABLED"
-fi
-
-PKG_CHECK_MODULES([DALI], [dali2-core dali2-adaptor dali2-toolkit])
-PKG_CHECK_MODULES(THORVG, thorvg)
-
-devincludepath=${includedir}
-AC_SUBST(devincludepath)
-AC_SUBST(DALI_CFLAGS)
-
-AC_CONFIG_FILES([
-Makefile
-])
-
-AC_OUTPUT
diff --git a/dali-extension/vector-image-renderer/file.list b/dali-extension/vector-image-renderer/file.list
deleted file mode 100644 (file)
index cf4f296..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-vector_image_renderer_plugin_src_files = \
-   $(extension_src_dir)/vector-image-renderer/tizen-vector-image-renderer.cpp
-
diff --git a/dali-extension/vector-image-renderer/tizen-vector-image-renderer.cpp b/dali-extension/vector-image-renderer/tizen-vector-image-renderer.cpp
deleted file mode 100755 (executable)
index f4dc962..0000000
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- * Copyright (c) 2020 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.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// CLASS HEADER
-#include <dali-extension/vector-image-renderer/tizen-vector-image-renderer.h>
-
-// EXTERNAL INCLUDES
-#include <dali/integration-api/debug.h>
-
-// The plugin factories
-extern "C" DALI_EXPORT_API Dali::VectorImageRendererPlugin* CreateVectorImageRendererPlugin( void )
-{
-  return new Dali::Plugin::TizenVectorImageRenderer;
-}
-
-namespace Dali
-{
-
-namespace Plugin
-{
-
-TizenVectorImageRenderer::TizenVectorImageRenderer()
-: mPicture(nullptr),
-  mDefaultWidth(0),
-  mDefaultHeight(0)
-{
-  tvg::Initializer::init(tvg::CanvasEngine::Sw, 0);
-
-  mSwCanvas = tvg::SwCanvas::gen();
-  mSwCanvas->mempool(tvg::SwCanvas::MempoolPolicy::Individual);
-  mSwCanvas->reserve(1);  //has one picture
-}
-
-TizenVectorImageRenderer::~TizenVectorImageRenderer()
-{
-  if(mPicture)
-  {
-    delete(mPicture);
-  }
-
-  tvg::Initializer::term(tvg::CanvasEngine::Sw);
-}
-
-bool TizenVectorImageRenderer::Load(const Vector<uint8_t>& data)
-{
-  if(!mSwCanvas)
-  {
-    DALI_LOG_ERROR("TizenVectorImageRenderer::Load Canvas Object is null [%p]\n", this);
-    return false;
-  }
-
-  if(!mPicture)
-  {
-    mPicture = tvg::Picture::gen().release();
-    if(!mPicture)
-    {
-      DALI_LOG_ERROR("TizenVectorImageRenderer::Load: Picture gen Fail [%p]\n", this);
-      return false;
-    }
-  }
-
-  tvg::Result ret = mPicture->load(reinterpret_cast<char*>(data.Begin()), data.Size(), false);
-
-  if(ret != tvg::Result::Success)
-  {
-    switch (ret)
-    {
-      case tvg::Result::InvalidArguments:
-      {
-        DALI_LOG_ERROR("TizenVectorImageRenderer::Load Load fail(Invalid arguments) Size:%d [%p]\n", data.Size(), this);
-        break;
-      }
-      case tvg::Result::NonSupport:
-      {
-        DALI_LOG_ERROR("TizenVectorImageRenderer::Load Load fail(Invalid SVG) Size:%d [%p]\n", data.Size(), this);
-        break;
-      }
-      case tvg::Result::Unknown:
-      {
-        DALI_LOG_ERROR("TizenVectorImageRenderer::Load Load fail(Parse fail) Size:%d [%p]\n", data.Size(), this);
-        break;
-      }
-      default:
-      {
-        DALI_LOG_ERROR("TizenVectorImageRenderer::Load Load fail / Size:%d [%p]\n", data.Size(), this);
-        break;
-      }
-    }
-    return false;
-  }
-
-  float w, h;
-  mPicture->size(&w, &h);
-  mDefaultWidth = static_cast<uint32_t>(w);
-  mDefaultHeight = static_cast<uint32_t>(h);
-
-  return true;
-}
-
-bool TizenVectorImageRenderer::Rasterize(Dali::Devel::PixelBuffer& buffer)
-{
-  if(!mSwCanvas || !mPicture)
-  {
-    DALI_LOG_ERROR("TizenVectorImageRenderer::Rasterize: either Canvas[%p] or Picture[%p] is invalid [%p]\n", mSwCanvas.get(), mPicture, this);
-    return false;
-  }
-
-  auto pBuffer = buffer.GetBuffer();
-  if(!pBuffer)
-  {
-    DALI_LOG_ERROR("TizenVectorImageRenderer::Rasterize: pixel buffer is null [%p]\n", this);
-    return false;
-  }
-
-  auto width = buffer.GetWidth();
-  auto height = buffer.GetHeight();
-
-  mSwCanvas->target(reinterpret_cast<uint32_t*>(pBuffer), width, width, height, tvg::SwCanvas::ABGR8888);
-
-  DALI_LOG_RELEASE_INFO("TizenVectorImageRenderer::Rasterize: Buffer[%p] size[%d x %d]! [%p]\n", pBuffer, width, height, this);
-
-  mPicture->size(width, height);
-
-  /* We can push everytime since we cleared the canvas just before. */
-  if(mSwCanvas->push(std::unique_ptr<tvg::Picture>(mPicture)) != tvg::Result::Success)
-  {
-    DALI_LOG_ERROR("TizenVectorImageRenderer::Rasterize: Picture push fail [%p]\n", this);
-    return false;
-  }
-
-  if(mSwCanvas->draw() != tvg::Result::Success)
-  {
-    DALI_LOG_ERROR("TizenVectorImageRenderer::Rasterize: Draw fail [%p]\n", this);
-    return false;
-  }
-
-  mSwCanvas->sync();
-
-  mSwCanvas->clear(false);
-
-  return true;
-}
-
-void TizenVectorImageRenderer::GetDefaultSize(uint32_t &width, uint32_t &height) const
-{
-  width = mDefaultWidth;
-  height = mDefaultHeight;
-}
-
-} // namespace Plugin
-
-} // namespace Dali;
diff --git a/dali-extension/vector-image-renderer/tizen-vector-image-renderer.h b/dali-extension/vector-image-renderer/tizen-vector-image-renderer.h
deleted file mode 100755 (executable)
index 5a92a44..0000000
+++ /dev/null
@@ -1,78 +0,0 @@
-#ifndef DALI_TIZEN_VECTOR_IMAGE_RENDERER_PLUGIN_H
-#define DALI_TIZEN_VECTOR_IMAGE_RENDERER_PLUGIN_H
-
-/*
- * Copyright (c) 2020 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.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// EXTERNAL INCLUDES
-#include <dali/devel-api/adaptor-framework/vector-image-renderer-plugin.h>
-#include <dali/devel-api/adaptor-framework/pixel-buffer.h>
-#include <memory>
-#include <thorvg.h>
-
-namespace Dali
-{
-
-namespace Plugin
-{
-
-/**
- * @brief Implementation of the Tizen vector image renderer class which has Tizen platform dependency.
- */
-class TizenVectorImageRenderer : public Dali::VectorImageRendererPlugin
-{
-public:
-
-  /**
-   * @brief Constructor.
-   */
-  TizenVectorImageRenderer();
-
-  /**
-   * @brief Destructor.
-   */
-  virtual ~TizenVectorImageRenderer();
-
-  /**
-   * @copydoc Dali::VectorImageRendererPlugin::Load()
-   */
-  bool Load(const Vector<uint8_t>& data) override;
-
-  /**
-   * @copydoc Dali::VectorImageRendererPlugin::Render()
-   */
-  bool Rasterize(Dali::Devel::PixelBuffer& buffer) override;
-
-  /**
-   * @copydoc Dali::VectorImageRendererPlugin::GetDefaultSize()
-   */
-  void GetDefaultSize(uint32_t& width, uint32_t& height) const override;
-
-private:
-
-  std::unique_ptr< tvg::SwCanvas >       mSwCanvas;
-  tvg::Picture*                          mPicture;        ///< The pointer to the picture
-
-  uint32_t                               mDefaultWidth;   ///< The width of the surface
-  uint32_t                               mDefaultHeight;  ///< The height of the surface
-};
-
-} // namespace Plugin
-
-} // namespace Dali;
-
-#endif // DALI_TIZEN_VECTOR_IMAGE_RENDERER_PLUGIN_H
index afe59b2..114d28d 100755 (executable)
@@ -149,20 +149,6 @@ BuildRequires:  pkgconfig(rlottie)
 Plugin to render a vector animation
 
 ####################################
-# Vector Image Renderer Plugin
-####################################
-%package vector-image-renderer-plugin
-Summary:    Plugin to render a vector image
-Group:      System/Libraries
-%if 0%{?tizen_65_or_greater}
-BuildRequires:  pkgconfig(thorvg)
-%endif
-
-%description vector-image-renderer-plugin
-Plugin to render a vector image
-
-
-####################################
 # color controller Plugin
 ####################################
 
@@ -333,12 +319,6 @@ exit 0
 %endif
 
 %if 0%{?tizen_65_or_greater}
-%post vector-image-renderer-plugin
-/sbin/ldconfig
-exit 0
-%endif
-
-%if 0%{?tizen_65_or_greater}
 %post rive-animation-view
 /sbin/ldconfig
 exit 0
@@ -396,12 +376,6 @@ exit 0
 %endif
 
 %if 0%{?tizen_65_or_greater}
-%postun vector-image-renderer-plugin
-/sbin/ldconfig
-exit 0
-%endif
-
-%if 0%{?tizen_65_or_greater}
 %postun rive-animation-view
 /sbin/ldconfig
 exit 0
@@ -478,14 +452,6 @@ exit 0
 %endif
 
 %if 0%{?tizen_65_or_greater}
-%files vector-image-renderer-plugin
-%manifest dali-extension.manifest
-%defattr(-,root,root,-)
-%{_libdir}/libdali2-vector-image-renderer-plugin.so*
-%license LICENSE
-%endif
-
-%if 0%{?tizen_65_or_greater}
 %files rive-animation-view
 %manifest dali-extension.manifest
 %defattr(-,root,root,-)