From f1feebf047b30ad47290f9b42835892d0e35f242 Mon Sep 17 00:00:00 2001 From: Hermet Park Date: Thu, 15 Apr 2021 18:26:11 +0900 Subject: [PATCH] common: code refactoring. renamed internal function, no logical changes. --- src/lib/tvgPaint.cpp | 2 +- src/lib/tvgRender.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/tvgPaint.cpp b/src/lib/tvgPaint.cpp index aca756fd..9b0aba77 100644 --- a/src/lib/tvgPaint.cpp +++ b/src/lib/tvgPaint.cpp @@ -206,7 +206,7 @@ void* Paint::Impl::update(RenderMethod& renderer, const RenderTransform* pTransf RenderRegion viewport2; if ((cmpFastTrack = _clipPathFastTrack(cmpTarget, pTransform, cmpTarget->pImpl->rTransform, viewport2))) { viewport = renderer.viewport(); - viewport2.merge(viewport); + viewport2.intersect(viewport); renderer.viewport(viewport2); } } diff --git a/src/lib/tvgRender.h b/src/lib/tvgRender.h index 16da972d..b45405ad 100644 --- a/src/lib/tvgRender.h +++ b/src/lib/tvgRender.h @@ -49,7 +49,7 @@ struct Compositor { struct RenderRegion { uint32_t x, y, w, h; - void merge(const RenderRegion& rhs) + void intersect(const RenderRegion& rhs) { auto x1 = x + w; auto y1 = y + h;