common: code refactoring.

renamed internal function, no logical changes.

Change-Id: Iea738826315a2f02f6d4f9d56b81a55379c09738

diff --git a/src/lib/tvgPaint.cpp b/src/lib/tvgPaint.cpp
index 5e2058730070227c0bb20bcadfd8c0681f3c782e..7d73ceba51cbe7daf49ef27a76d1934bb053be09 100644 (file)
--- a/src/lib/tvgPaint.cpp
+++ b/src/lib/tvgPaint.cpp
@@ -210,7 +210,7 @@ dlog_print(DLOG_ERROR, LOG_TAG, "update paint (%p) type(%d)", this, (int) this->
             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 16da972d2ea4856bff86726be4ee6a6155f3f3b3..b45405addb75c7e692470aa2a7688b469dca714c 100644 (file)
--- 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;