diff --git a/src/libs/thorvg/tvgPaint.cpp b/src/libs/thorvg/tvgPaint.cpp index 4db483107c..a2f4c628ab 100644 --- a/src/libs/thorvg/tvgPaint.cpp +++ b/src/libs/thorvg/tvgPaint.cpp @@ -268,7 +268,8 @@ RenderData Paint::Impl::update(RenderMethod* renderer, const RenderTransform* pT } if (tryFastTrack) { RenderRegion viewport2; - if ((compFastTrack = _compFastTrack(target, pTransform, target->pImpl->rTransform, viewport2)) == Result::Success) { + if (target->composite(nullptr) != CompositeMethod::ClipPath && + (compFastTrack = _compFastTrack(target, pTransform, target->pImpl->rTransform, viewport2)) == Result::Success) { viewport = renderer->viewport(); viewport2.intersect(viewport); renderer->viewport(viewport2); diff --git a/tests/ref_imgs_vg_lite/draw/render/argb8888/demo_render_image_normal_1_opa_128.png b/tests/ref_imgs_vg_lite/draw/render/argb8888/demo_render_image_normal_1_opa_128.png index ffa091f446..c738bc7b72 100644 Binary files a/tests/ref_imgs_vg_lite/draw/render/argb8888/demo_render_image_normal_1_opa_128.png and b/tests/ref_imgs_vg_lite/draw/render/argb8888/demo_render_image_normal_1_opa_128.png differ diff --git a/tests/ref_imgs_vg_lite/draw/render/argb8888/demo_render_image_normal_1_opa_255.png b/tests/ref_imgs_vg_lite/draw/render/argb8888/demo_render_image_normal_1_opa_255.png index d120eb09b0..bd66227173 100644 Binary files a/tests/ref_imgs_vg_lite/draw/render/argb8888/demo_render_image_normal_1_opa_255.png and b/tests/ref_imgs_vg_lite/draw/render/argb8888/demo_render_image_normal_1_opa_255.png differ diff --git a/tests/ref_imgs_vg_lite/draw/render/argb8888/demo_render_image_normal_2_opa_128.png b/tests/ref_imgs_vg_lite/draw/render/argb8888/demo_render_image_normal_2_opa_128.png index 545e2ac50e..96f48c0d4e 100644 Binary files a/tests/ref_imgs_vg_lite/draw/render/argb8888/demo_render_image_normal_2_opa_128.png and b/tests/ref_imgs_vg_lite/draw/render/argb8888/demo_render_image_normal_2_opa_128.png differ diff --git a/tests/ref_imgs_vg_lite/draw/render/argb8888/demo_render_image_normal_2_opa_255.png b/tests/ref_imgs_vg_lite/draw/render/argb8888/demo_render_image_normal_2_opa_255.png index fb1712ecec..c93acda208 100644 Binary files a/tests/ref_imgs_vg_lite/draw/render/argb8888/demo_render_image_normal_2_opa_255.png and b/tests/ref_imgs_vg_lite/draw/render/argb8888/demo_render_image_normal_2_opa_255.png differ diff --git a/tests/ref_imgs_vg_lite/draw/render/argb8888/demo_render_image_recolor_1_opa_128.png b/tests/ref_imgs_vg_lite/draw/render/argb8888/demo_render_image_recolor_1_opa_128.png index 832479d8ac..b4f03533b5 100644 Binary files a/tests/ref_imgs_vg_lite/draw/render/argb8888/demo_render_image_recolor_1_opa_128.png and b/tests/ref_imgs_vg_lite/draw/render/argb8888/demo_render_image_recolor_1_opa_128.png differ diff --git a/tests/ref_imgs_vg_lite/draw/render/argb8888/demo_render_image_recolor_1_opa_255.png b/tests/ref_imgs_vg_lite/draw/render/argb8888/demo_render_image_recolor_1_opa_255.png index 178ad0808a..71025486f4 100644 Binary files a/tests/ref_imgs_vg_lite/draw/render/argb8888/demo_render_image_recolor_1_opa_255.png and b/tests/ref_imgs_vg_lite/draw/render/argb8888/demo_render_image_recolor_1_opa_255.png differ diff --git a/tests/ref_imgs_vg_lite/draw/render/argb8888/demo_render_image_recolor_2_opa_128.png b/tests/ref_imgs_vg_lite/draw/render/argb8888/demo_render_image_recolor_2_opa_128.png index 45714a72a5..938cbd1c4f 100644 Binary files a/tests/ref_imgs_vg_lite/draw/render/argb8888/demo_render_image_recolor_2_opa_128.png and b/tests/ref_imgs_vg_lite/draw/render/argb8888/demo_render_image_recolor_2_opa_128.png differ diff --git a/tests/ref_imgs_vg_lite/draw/render/argb8888/demo_render_image_recolor_2_opa_255.png b/tests/ref_imgs_vg_lite/draw/render/argb8888/demo_render_image_recolor_2_opa_255.png index 1f2f6cf4f5..2c62524729 100644 Binary files a/tests/ref_imgs_vg_lite/draw/render/argb8888/demo_render_image_recolor_2_opa_255.png and b/tests/ref_imgs_vg_lite/draw/render/argb8888/demo_render_image_recolor_2_opa_255.png differ diff --git a/tests/ref_imgs_vg_lite/draw/render/l8/demo_render_image_normal_1_opa_128.png b/tests/ref_imgs_vg_lite/draw/render/l8/demo_render_image_normal_1_opa_128.png index 1bff6b468f..68b3f1d2a9 100644 Binary files a/tests/ref_imgs_vg_lite/draw/render/l8/demo_render_image_normal_1_opa_128.png and b/tests/ref_imgs_vg_lite/draw/render/l8/demo_render_image_normal_1_opa_128.png differ diff --git a/tests/ref_imgs_vg_lite/draw/render/l8/demo_render_image_normal_1_opa_255.png b/tests/ref_imgs_vg_lite/draw/render/l8/demo_render_image_normal_1_opa_255.png index 339bab4c0d..08db4e3ecd 100644 Binary files a/tests/ref_imgs_vg_lite/draw/render/l8/demo_render_image_normal_1_opa_255.png and b/tests/ref_imgs_vg_lite/draw/render/l8/demo_render_image_normal_1_opa_255.png differ diff --git a/tests/ref_imgs_vg_lite/draw/render/l8/demo_render_image_normal_2_opa_128.png b/tests/ref_imgs_vg_lite/draw/render/l8/demo_render_image_normal_2_opa_128.png index ec47a0068e..accf28fe0a 100644 Binary files a/tests/ref_imgs_vg_lite/draw/render/l8/demo_render_image_normal_2_opa_128.png and b/tests/ref_imgs_vg_lite/draw/render/l8/demo_render_image_normal_2_opa_128.png differ diff --git a/tests/ref_imgs_vg_lite/draw/render/l8/demo_render_image_normal_2_opa_255.png b/tests/ref_imgs_vg_lite/draw/render/l8/demo_render_image_normal_2_opa_255.png index a4c590f254..d5b6020c69 100644 Binary files a/tests/ref_imgs_vg_lite/draw/render/l8/demo_render_image_normal_2_opa_255.png and b/tests/ref_imgs_vg_lite/draw/render/l8/demo_render_image_normal_2_opa_255.png differ diff --git a/tests/ref_imgs_vg_lite/draw/render/l8/demo_render_image_recolor_1_opa_128.png b/tests/ref_imgs_vg_lite/draw/render/l8/demo_render_image_recolor_1_opa_128.png index 41dbe8869b..f648d6ddf0 100644 Binary files a/tests/ref_imgs_vg_lite/draw/render/l8/demo_render_image_recolor_1_opa_128.png and b/tests/ref_imgs_vg_lite/draw/render/l8/demo_render_image_recolor_1_opa_128.png differ diff --git a/tests/ref_imgs_vg_lite/draw/render/l8/demo_render_image_recolor_1_opa_255.png b/tests/ref_imgs_vg_lite/draw/render/l8/demo_render_image_recolor_1_opa_255.png index 2fa4a256e3..2b48c265e6 100644 Binary files a/tests/ref_imgs_vg_lite/draw/render/l8/demo_render_image_recolor_1_opa_255.png and b/tests/ref_imgs_vg_lite/draw/render/l8/demo_render_image_recolor_1_opa_255.png differ diff --git a/tests/ref_imgs_vg_lite/draw/render/l8/demo_render_image_recolor_2_opa_128.png b/tests/ref_imgs_vg_lite/draw/render/l8/demo_render_image_recolor_2_opa_128.png index 367cc94e0b..87d1d7077b 100644 Binary files a/tests/ref_imgs_vg_lite/draw/render/l8/demo_render_image_recolor_2_opa_128.png and b/tests/ref_imgs_vg_lite/draw/render/l8/demo_render_image_recolor_2_opa_128.png differ diff --git a/tests/ref_imgs_vg_lite/draw/render/l8/demo_render_image_recolor_2_opa_255.png b/tests/ref_imgs_vg_lite/draw/render/l8/demo_render_image_recolor_2_opa_255.png index d002e8a287..15b121e2ef 100644 Binary files a/tests/ref_imgs_vg_lite/draw/render/l8/demo_render_image_recolor_2_opa_255.png and b/tests/ref_imgs_vg_lite/draw/render/l8/demo_render_image_recolor_2_opa_255.png differ diff --git a/tests/ref_imgs_vg_lite/draw/render/rgb565/demo_render_image_normal_1_opa_128.png b/tests/ref_imgs_vg_lite/draw/render/rgb565/demo_render_image_normal_1_opa_128.png index deb0e4fa3b..0390036208 100644 Binary files a/tests/ref_imgs_vg_lite/draw/render/rgb565/demo_render_image_normal_1_opa_128.png and b/tests/ref_imgs_vg_lite/draw/render/rgb565/demo_render_image_normal_1_opa_128.png differ diff --git a/tests/ref_imgs_vg_lite/draw/render/rgb565/demo_render_image_normal_1_opa_255.png b/tests/ref_imgs_vg_lite/draw/render/rgb565/demo_render_image_normal_1_opa_255.png index a4b9c90c64..12315ee85f 100644 Binary files a/tests/ref_imgs_vg_lite/draw/render/rgb565/demo_render_image_normal_1_opa_255.png and b/tests/ref_imgs_vg_lite/draw/render/rgb565/demo_render_image_normal_1_opa_255.png differ diff --git a/tests/ref_imgs_vg_lite/draw/render/rgb565/demo_render_image_normal_2_opa_128.png b/tests/ref_imgs_vg_lite/draw/render/rgb565/demo_render_image_normal_2_opa_128.png index 8ea224b485..79ff8cc5a2 100644 Binary files a/tests/ref_imgs_vg_lite/draw/render/rgb565/demo_render_image_normal_2_opa_128.png and b/tests/ref_imgs_vg_lite/draw/render/rgb565/demo_render_image_normal_2_opa_128.png differ diff --git a/tests/ref_imgs_vg_lite/draw/render/rgb565/demo_render_image_normal_2_opa_255.png b/tests/ref_imgs_vg_lite/draw/render/rgb565/demo_render_image_normal_2_opa_255.png index 493579e4fe..00f4ddc98c 100644 Binary files a/tests/ref_imgs_vg_lite/draw/render/rgb565/demo_render_image_normal_2_opa_255.png and b/tests/ref_imgs_vg_lite/draw/render/rgb565/demo_render_image_normal_2_opa_255.png differ diff --git a/tests/ref_imgs_vg_lite/draw/render/rgb565/demo_render_image_recolor_1_opa_128.png b/tests/ref_imgs_vg_lite/draw/render/rgb565/demo_render_image_recolor_1_opa_128.png index d70da4ee90..9ecb94c6a0 100644 Binary files a/tests/ref_imgs_vg_lite/draw/render/rgb565/demo_render_image_recolor_1_opa_128.png and b/tests/ref_imgs_vg_lite/draw/render/rgb565/demo_render_image_recolor_1_opa_128.png differ diff --git a/tests/ref_imgs_vg_lite/draw/render/rgb565/demo_render_image_recolor_1_opa_255.png b/tests/ref_imgs_vg_lite/draw/render/rgb565/demo_render_image_recolor_1_opa_255.png index 59ee729803..10dd075290 100644 Binary files a/tests/ref_imgs_vg_lite/draw/render/rgb565/demo_render_image_recolor_1_opa_255.png and b/tests/ref_imgs_vg_lite/draw/render/rgb565/demo_render_image_recolor_1_opa_255.png differ diff --git a/tests/ref_imgs_vg_lite/draw/render/rgb565/demo_render_image_recolor_2_opa_128.png b/tests/ref_imgs_vg_lite/draw/render/rgb565/demo_render_image_recolor_2_opa_128.png index 6a3cce1237..7641610631 100644 Binary files a/tests/ref_imgs_vg_lite/draw/render/rgb565/demo_render_image_recolor_2_opa_128.png and b/tests/ref_imgs_vg_lite/draw/render/rgb565/demo_render_image_recolor_2_opa_128.png differ diff --git a/tests/ref_imgs_vg_lite/draw/render/rgb565/demo_render_image_recolor_2_opa_255.png b/tests/ref_imgs_vg_lite/draw/render/rgb565/demo_render_image_recolor_2_opa_255.png index 9f5796b3a8..29dfaf5571 100644 Binary files a/tests/ref_imgs_vg_lite/draw/render/rgb565/demo_render_image_recolor_2_opa_255.png and b/tests/ref_imgs_vg_lite/draw/render/rgb565/demo_render_image_recolor_2_opa_255.png differ diff --git a/tests/ref_imgs_vg_lite/draw/render/rgb888/demo_render_image_normal_1_opa_128.png b/tests/ref_imgs_vg_lite/draw/render/rgb888/demo_render_image_normal_1_opa_128.png index ffa091f446..c738bc7b72 100644 Binary files a/tests/ref_imgs_vg_lite/draw/render/rgb888/demo_render_image_normal_1_opa_128.png and b/tests/ref_imgs_vg_lite/draw/render/rgb888/demo_render_image_normal_1_opa_128.png differ diff --git a/tests/ref_imgs_vg_lite/draw/render/rgb888/demo_render_image_normal_1_opa_255.png b/tests/ref_imgs_vg_lite/draw/render/rgb888/demo_render_image_normal_1_opa_255.png index d120eb09b0..bd66227173 100644 Binary files a/tests/ref_imgs_vg_lite/draw/render/rgb888/demo_render_image_normal_1_opa_255.png and b/tests/ref_imgs_vg_lite/draw/render/rgb888/demo_render_image_normal_1_opa_255.png differ diff --git a/tests/ref_imgs_vg_lite/draw/render/rgb888/demo_render_image_normal_2_opa_128.png b/tests/ref_imgs_vg_lite/draw/render/rgb888/demo_render_image_normal_2_opa_128.png index 545e2ac50e..96f48c0d4e 100644 Binary files a/tests/ref_imgs_vg_lite/draw/render/rgb888/demo_render_image_normal_2_opa_128.png and b/tests/ref_imgs_vg_lite/draw/render/rgb888/demo_render_image_normal_2_opa_128.png differ diff --git a/tests/ref_imgs_vg_lite/draw/render/rgb888/demo_render_image_normal_2_opa_255.png b/tests/ref_imgs_vg_lite/draw/render/rgb888/demo_render_image_normal_2_opa_255.png index fb1712ecec..c93acda208 100644 Binary files a/tests/ref_imgs_vg_lite/draw/render/rgb888/demo_render_image_normal_2_opa_255.png and b/tests/ref_imgs_vg_lite/draw/render/rgb888/demo_render_image_normal_2_opa_255.png differ diff --git a/tests/ref_imgs_vg_lite/draw/render/rgb888/demo_render_image_recolor_1_opa_128.png b/tests/ref_imgs_vg_lite/draw/render/rgb888/demo_render_image_recolor_1_opa_128.png index 832479d8ac..b4f03533b5 100644 Binary files a/tests/ref_imgs_vg_lite/draw/render/rgb888/demo_render_image_recolor_1_opa_128.png and b/tests/ref_imgs_vg_lite/draw/render/rgb888/demo_render_image_recolor_1_opa_128.png differ diff --git a/tests/ref_imgs_vg_lite/draw/render/rgb888/demo_render_image_recolor_1_opa_255.png b/tests/ref_imgs_vg_lite/draw/render/rgb888/demo_render_image_recolor_1_opa_255.png index 178ad0808a..71025486f4 100644 Binary files a/tests/ref_imgs_vg_lite/draw/render/rgb888/demo_render_image_recolor_1_opa_255.png and b/tests/ref_imgs_vg_lite/draw/render/rgb888/demo_render_image_recolor_1_opa_255.png differ diff --git a/tests/ref_imgs_vg_lite/draw/render/rgb888/demo_render_image_recolor_2_opa_128.png b/tests/ref_imgs_vg_lite/draw/render/rgb888/demo_render_image_recolor_2_opa_128.png index 45714a72a5..938cbd1c4f 100644 Binary files a/tests/ref_imgs_vg_lite/draw/render/rgb888/demo_render_image_recolor_2_opa_128.png and b/tests/ref_imgs_vg_lite/draw/render/rgb888/demo_render_image_recolor_2_opa_128.png differ diff --git a/tests/ref_imgs_vg_lite/draw/render/rgb888/demo_render_image_recolor_2_opa_255.png b/tests/ref_imgs_vg_lite/draw/render/rgb888/demo_render_image_recolor_2_opa_255.png index 1f2f6cf4f5..2c62524729 100644 Binary files a/tests/ref_imgs_vg_lite/draw/render/rgb888/demo_render_image_recolor_2_opa_255.png and b/tests/ref_imgs_vg_lite/draw/render/rgb888/demo_render_image_recolor_2_opa_255.png differ diff --git a/tests/ref_imgs_vg_lite/draw/render/xrgb8888/demo_render_image_normal_1_opa_128.png b/tests/ref_imgs_vg_lite/draw/render/xrgb8888/demo_render_image_normal_1_opa_128.png index ffa091f446..c738bc7b72 100644 Binary files a/tests/ref_imgs_vg_lite/draw/render/xrgb8888/demo_render_image_normal_1_opa_128.png and b/tests/ref_imgs_vg_lite/draw/render/xrgb8888/demo_render_image_normal_1_opa_128.png differ diff --git a/tests/ref_imgs_vg_lite/draw/render/xrgb8888/demo_render_image_normal_1_opa_255.png b/tests/ref_imgs_vg_lite/draw/render/xrgb8888/demo_render_image_normal_1_opa_255.png index d120eb09b0..bd66227173 100644 Binary files a/tests/ref_imgs_vg_lite/draw/render/xrgb8888/demo_render_image_normal_1_opa_255.png and b/tests/ref_imgs_vg_lite/draw/render/xrgb8888/demo_render_image_normal_1_opa_255.png differ diff --git a/tests/ref_imgs_vg_lite/draw/render/xrgb8888/demo_render_image_normal_2_opa_128.png b/tests/ref_imgs_vg_lite/draw/render/xrgb8888/demo_render_image_normal_2_opa_128.png index 545e2ac50e..96f48c0d4e 100644 Binary files a/tests/ref_imgs_vg_lite/draw/render/xrgb8888/demo_render_image_normal_2_opa_128.png and b/tests/ref_imgs_vg_lite/draw/render/xrgb8888/demo_render_image_normal_2_opa_128.png differ diff --git a/tests/ref_imgs_vg_lite/draw/render/xrgb8888/demo_render_image_normal_2_opa_255.png b/tests/ref_imgs_vg_lite/draw/render/xrgb8888/demo_render_image_normal_2_opa_255.png index fb1712ecec..c93acda208 100644 Binary files a/tests/ref_imgs_vg_lite/draw/render/xrgb8888/demo_render_image_normal_2_opa_255.png and b/tests/ref_imgs_vg_lite/draw/render/xrgb8888/demo_render_image_normal_2_opa_255.png differ diff --git a/tests/ref_imgs_vg_lite/draw/render/xrgb8888/demo_render_image_recolor_1_opa_128.png b/tests/ref_imgs_vg_lite/draw/render/xrgb8888/demo_render_image_recolor_1_opa_128.png index 832479d8ac..b4f03533b5 100644 Binary files a/tests/ref_imgs_vg_lite/draw/render/xrgb8888/demo_render_image_recolor_1_opa_128.png and b/tests/ref_imgs_vg_lite/draw/render/xrgb8888/demo_render_image_recolor_1_opa_128.png differ diff --git a/tests/ref_imgs_vg_lite/draw/render/xrgb8888/demo_render_image_recolor_1_opa_255.png b/tests/ref_imgs_vg_lite/draw/render/xrgb8888/demo_render_image_recolor_1_opa_255.png index 178ad0808a..71025486f4 100644 Binary files a/tests/ref_imgs_vg_lite/draw/render/xrgb8888/demo_render_image_recolor_1_opa_255.png and b/tests/ref_imgs_vg_lite/draw/render/xrgb8888/demo_render_image_recolor_1_opa_255.png differ diff --git a/tests/ref_imgs_vg_lite/draw/render/xrgb8888/demo_render_image_recolor_2_opa_128.png b/tests/ref_imgs_vg_lite/draw/render/xrgb8888/demo_render_image_recolor_2_opa_128.png index 45714a72a5..938cbd1c4f 100644 Binary files a/tests/ref_imgs_vg_lite/draw/render/xrgb8888/demo_render_image_recolor_2_opa_128.png and b/tests/ref_imgs_vg_lite/draw/render/xrgb8888/demo_render_image_recolor_2_opa_128.png differ diff --git a/tests/ref_imgs_vg_lite/draw/render/xrgb8888/demo_render_image_recolor_2_opa_255.png b/tests/ref_imgs_vg_lite/draw/render/xrgb8888/demo_render_image_recolor_2_opa_255.png index 1f2f6cf4f5..2c62524729 100644 Binary files a/tests/ref_imgs_vg_lite/draw/render/xrgb8888/demo_render_image_recolor_2_opa_255.png and b/tests/ref_imgs_vg_lite/draw/render/xrgb8888/demo_render_image_recolor_2_opa_255.png differ diff --git a/tests/ref_imgs_vg_lite/widgets/image_rotate_pivot_center.png b/tests/ref_imgs_vg_lite/widgets/image_rotate_pivot_center.png index 0cbfe8bf28..fc93b2de3e 100644 Binary files a/tests/ref_imgs_vg_lite/widgets/image_rotate_pivot_center.png and b/tests/ref_imgs_vg_lite/widgets/image_rotate_pivot_center.png differ diff --git a/tests/ref_imgs_vg_lite/widgets/image_rotate_pivot_top_left.png b/tests/ref_imgs_vg_lite/widgets/image_rotate_pivot_top_left.png index eb379fa718..fee4d46078 100644 Binary files a/tests/ref_imgs_vg_lite/widgets/image_rotate_pivot_top_left.png and b/tests/ref_imgs_vg_lite/widgets/image_rotate_pivot_top_left.png differ diff --git a/tests/ref_imgs_vg_lite/widgets/image_scale_pivot_center.png b/tests/ref_imgs_vg_lite/widgets/image_scale_pivot_center.png index a2f0254b68..d745f4f7ba 100644 Binary files a/tests/ref_imgs_vg_lite/widgets/image_scale_pivot_center.png and b/tests/ref_imgs_vg_lite/widgets/image_scale_pivot_center.png differ diff --git a/tests/ref_imgs_vg_lite/widgets/image_scale_pivot_top_left.png b/tests/ref_imgs_vg_lite/widgets/image_scale_pivot_top_left.png index 770e048a0b..b11b57755a 100644 Binary files a/tests/ref_imgs_vg_lite/widgets/image_scale_pivot_top_left.png and b/tests/ref_imgs_vg_lite/widgets/image_scale_pivot_top_left.png differ diff --git a/tests/ref_imgs_vg_lite/widgets/image_scale_x_pivot_center.png b/tests/ref_imgs_vg_lite/widgets/image_scale_x_pivot_center.png index 43d3ff4284..8b3ee63a74 100644 Binary files a/tests/ref_imgs_vg_lite/widgets/image_scale_x_pivot_center.png and b/tests/ref_imgs_vg_lite/widgets/image_scale_x_pivot_center.png differ diff --git a/tests/ref_imgs_vg_lite/widgets/image_scale_x_pivot_top_left.png b/tests/ref_imgs_vg_lite/widgets/image_scale_x_pivot_top_left.png index a2f28503c8..c2befbf915 100644 Binary files a/tests/ref_imgs_vg_lite/widgets/image_scale_x_pivot_top_left.png and b/tests/ref_imgs_vg_lite/widgets/image_scale_x_pivot_top_left.png differ