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

canvas: fix crash issue.

Browse source 
When canvas target size is changed, it need to update all retained paints again
so that they cannot redraw onto out of buffer boundary.
This commit is contained in:
Hermet Park 2021-02-24 19:53:39 +09:00 • committed by Hermet Park
parent 197879f2ef
commit 69ff5a484b
3 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/lib/tvgCanvasImpl.h
View file

@ -32,6 +32,7 @@ struct Canvas::Impl
{
Array<Paint*> paints;
RenderMethod* renderer;
bool refresh; //if all paints should be updated by force.
Impl(RenderMethod* pRenderer):renderer(pRenderer)
{
@ -70,12 +71,18 @@ struct Canvas::Impl
return Result::Success;
}
void needRefresh()
{
refresh = true;
}
Result update(Paint* paint, bool force)
{
if (!renderer) return Result::InsufficientCondition;
Array<RenderData> clips;
auto flag = force ? RenderUpdateFlag::All : RenderUpdateFlag::None;
auto flag = RenderUpdateFlag::None;
if (refresh | force) flag = RenderUpdateFlag::All;
//Update single paint node
if (paint) {
@ -86,6 +93,9 @@ struct Canvas::Impl
(*paint)->pImpl->update(*renderer, nullptr, 255, clips, flag);
}
}
refresh = false;
return Result::Success;
}

3
src/lib/tvgGlCanvas.cpp
View file

@ -68,6 +68,9 @@ Result GlCanvas::target(uint32_t* buffer, uint32_t stride, uint32_t w, uint32_t
if (!renderer->target(buffer, stride, w, h)) return Result::Unknown;
//Paints must be updated again with this new target.
Canvas::pImpl->needRefresh();
return Result::Success;
#endif
return Result::NonSupport;

3
src/lib/tvgSwCanvas.cpp
View file

@ -67,6 +67,9 @@ Result SwCanvas::target(uint32_t* buffer, uint32_t stride, uint32_t w, uint32_t
if (!renderer->target(buffer, stride, w, h, cs)) return Result::InvalidArguments;
//Paints must be updated again with this new target.
Canvas::pImpl->needRefresh();
return Result::Success;
#endif
return Result::NonSupport;