common paint: keep clean apis and small size.

these are no more necessary.

Change-Id: I315b39c77c413da1bc6102cabd5d797a1931eb9b

diff --git a/inc/thorvg.h b/inc/thorvg.h
index c5a140f..1fd0f90 100644 (file)
--- a/inc/thorvg.h
+++ b/inc/thorvg.h
@@ -366,20 +366,6 @@ public:
     CompositeMethod composite(const Paint** target) const noexcept;
 
     /**
-     * @brief Gets the composition source object and the composition method.
-     *
-     * @param[out] source The paint of the composition source object.
-     * @param[out] method The method used to composite the source object with the target.
-     *
-     * @return Result::Success when the paint object used as a composition target, Result::InsufficientCondition otherwise.
-     *
-     * @warning Please do not use it, this API is not official one. It could be modified in the next version.
-     *
-     * @BETA_API
-     */
-    Result composite(const Paint** source, CompositeMethod* method) const noexcept;
-
-    /**
      * @brief Return the unique id value of the paint instance.
      *
      * This method can be called for checking the current concrete instance type.

diff --git a/src/lib/tvgPaint.cpp b/src/lib/tvgPaint.cpp
index 0b49122..506fc55 100644 (file)
--- a/src/lib/tvgPaint.cpp
+++ b/src/lib/tvgPaint.cpp
@@ -386,19 +386,6 @@ CompositeMethod Paint::composite(const Paint** target) const noexcept
 }
 
 
-Result Paint::composite(const Paint** source, CompositeMethod* method) const noexcept
-{
-    if (source) *source = pImpl->compSource;
-    auto met = (pImpl->compSource && pImpl->compSource->pImpl->compData ?
-                pImpl->compSource->pImpl->compData->method : CompositeMethod::None);
-    if (method) *method = met;
-
-    if (pImpl->compSource != nullptr && met != CompositeMethod::None)
-        return Result::Success;
-    return Result::InsufficientCondition;
-}
-
-
 Result Paint::opacity(uint8_t o) noexcept
 {
     if (pImpl->opacity == o) return Result::Success;

diff --git a/src/lib/tvgPaint.h b/src/lib/tvgPaint.h
index 45c679d..9ec0232 100644 (file)
--- a/src/lib/tvgPaint.h
+++ b/src/lib/tvgPaint.h
@@ -63,7 +63,6 @@ namespace tvg
         StrategyMethod* smethod = nullptr;
         RenderTransform* rTransform = nullptr;
         Composite* compData = nullptr;
-        Paint* compSource = nullptr;
         uint32_t renderFlag = RenderUpdateFlag::None;
         uint32_t ctxFlag = ContextFlag::Invalid;
         uint32_t id;
@@ -138,7 +137,6 @@ namespace tvg
                 if (!target && method == CompositeMethod::None) return true;
                 compData = static_cast<Composite*>(calloc(1, sizeof(Composite)));
             }
-            target->pImpl->compSource = source;
             compData->target = target;
             compData->source = source;
             compData->method = method;