git_clone/thorvg
1
0
Fork 0
mirror of https://github.com/thorvg/thorvg.git synced 2025-06-20 15:03:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

capi: fix incorrect composite api.

Browse source 
Api prototype is completely wrong, now it's corrected.
This commit is contained in:
Hermet Park 2021-03-04 11:14:16 +09:00 • committed by Hermet Park
parent a72be6159d
commit cb425fa4bb
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
inc/thorvg_capi.h
View file

@ -579,15 +579,16 @@ TVG_EXPORT Tvg_Paint* tvg_paint_duplicate(Tvg_Paint* paint);
TVG_EXPORT Tvg_Result tvg_paint_get_bounds(const Tvg_Paint* paint, float* x, float* y, float* w, float* h); TVG_EXPORT Tvg_Result tvg_paint_get_bounds(const Tvg_Paint* paint, float* x, float* y, float* w, float* h);
/*! /*!
* \fn TVG_EXPORT Tvg_Result tvg_paint_set_composite_method(const Tvg_Paint* paint, Tvg_Composite_Method method) * \fn TVG_EXPORT Tvg_Result tvg_paint_set_composite_method(Tvg_Paint* paint, Tvg_Paint* target, Tvg_Composite_Method method)
* \brief The function set composition method * \brief The function set composition method.
* \param[in] paint Tvg_Paint pointer * \param[in] paint Tvg_Paint composition source
* \param[in] target Tvg_Paint composition target
* \param[in] method Tvg_Composite_Method used composite method * \param[in] method Tvg_Composite_Method used composite method
* \return Tvg_Result return value * \return Tvg_Result return value
* - TVG_RESULT_SUCCESS: if ok. * - TVG_RESULT_SUCCESS: if ok.
* - TVG_RESULT_INVALID_PARAMETERS: if paint is invalid * - TVG_RESULT_INVALID_PARAMETERS: if paint is invalid
*/ */
TVG_EXPORT Tvg_Result tvg_paint_set_composite_method(const Tvg_Paint* paint, Tvg_Composite_Method method); TVG_EXPORT Tvg_Result tvg_paint_set_composite_method(Tvg_Paint* paint, Tvg_Paint* target, Tvg_Composite_Method method);
/************************************************************************/ /************************************************************************/
/* Shape API */ /* Shape API */

4
src/bindings/capi/tvgCapi.cpp
View file

@ -191,10 +191,10 @@ TVG_EXPORT Tvg_Result tvg_paint_get_bounds(const Tvg_Paint* paint, float* x, flo
return (Tvg_Result) reinterpret_cast<const Paint*>(paint)->bounds(x, y, w, h); return (Tvg_Result) reinterpret_cast<const Paint*>(paint)->bounds(x, y, w, h);
} }
TVG_EXPORT Tvg_Result tvg_paint_set_composite_method(const Tvg_Paint* paint, Tvg_Composite_Method method) TVG_EXPORT Tvg_Result tvg_paint_set_composite_method(Tvg_Paint* paint, Tvg_Paint* target, Tvg_Composite_Method method)
{ {
if (!paint) return TVG_RESULT_INVALID_ARGUMENT; if (!paint) return TVG_RESULT_INVALID_ARGUMENT;
return (Tvg_Result) reinterpret_cast<const Paint*>(paint)->composite(unique_ptr<Paint>((Paint*)(paint)), (CompositeMethod)method); return (Tvg_Result) reinterpret_cast<const Paint*>(paint)->composite(unique_ptr<Paint>((Paint*)(target)), (CompositeMethod)method);
} }
/************************************************************************/ /************************************************************************/