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

sw_engine: --compiler warnings on MSYS2

Browse source 
comparison of integer expressions of different signedness: 'uint32_t' {aka 'unsigned int'} and 'long int' [-Wsign-compare]
This commit is contained in:
Hermet Park 2024-12-13 00:44:31 +09:00
parent a0a7ec25a2
commit 70fe8f2f95
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/renderer/sw_engine/tvgSwPostEffect.cpp
View file

@ -417,8 +417,8 @@ bool effectFill(SwCompositor* cmp, const RenderEffectFill* params, bool direct)
auto opacity = direct ? MULTIPLY(params->color[3], cmp->opacity) : params->color[3]; auto opacity = direct ? MULTIPLY(params->color[3], cmp->opacity) : params->color[3];
auto& bbox = cmp->bbox; auto& bbox = cmp->bbox;
auto w = (bbox.max.x - bbox.min.x); auto w = size_t(bbox.max.x - bbox.min.x);
auto h = (bbox.max.y - bbox.min.y); auto h = size_t(bbox.max.y - bbox.min.y);
auto color = cmp->recoverSfc->join(params->color[0], params->color[1], params->color[2], 255); auto color = cmp->recoverSfc->join(params->color[0], params->color[1], params->color[2], 255);
TVGLOG("SW_ENGINE", "Fill region(%ld, %ld, %ld, %ld), param(%d %d %d %d)", bbox.min.x, bbox.min.y, bbox.max.x, bbox.max.y, params->color[0], params->color[1], params->color[2], params->color[3]); TVGLOG("SW_ENGINE", "Fill region(%ld, %ld, %ld, %ld), param(%d %d %d %d)", bbox.min.x, bbox.min.y, bbox.max.x, bbox.max.y, params->color[0], params->color[1], params->color[2], params->color[3]);
@ -426,10 +426,10 @@ bool effectFill(SwCompositor* cmp, const RenderEffectFill* params, bool direct)
if (direct) { if (direct) {
auto dbuffer = cmp->recoverSfc->buf32 + (bbox.min.y * cmp->recoverSfc->stride + bbox.min.x); auto dbuffer = cmp->recoverSfc->buf32 + (bbox.min.y * cmp->recoverSfc->stride + bbox.min.x);
auto sbuffer = cmp->image.buf32 + (bbox.min.y * cmp->image.stride + bbox.min.x); auto sbuffer = cmp->image.buf32 + (bbox.min.y * cmp->image.stride + bbox.min.x);
for (uint32_t y = 0; y < h; ++y) { for (size_t y = 0; y < h; ++y) {
auto dst = dbuffer; auto dst = dbuffer;
auto src = sbuffer; auto src = sbuffer;
for (uint32_t x = 0; x < w; ++x, ++dst, ++src) { for (size_t x = 0; x < w; ++x, ++dst, ++src) {
auto a = MULTIPLY(opacity, A(*src)); auto a = MULTIPLY(opacity, A(*src));
auto tmp = ALPHA_BLEND(color, a); auto tmp = ALPHA_BLEND(color, a);
*dst = tmp + ALPHA_BLEND(*dst, 255 - a); *dst = tmp + ALPHA_BLEND(*dst, 255 - a);
@ -440,9 +440,9 @@ bool effectFill(SwCompositor* cmp, const RenderEffectFill* params, bool direct)
cmp->valid = true; //no need the subsequent composition cmp->valid = true; //no need the subsequent composition
} else { } else {
auto dbuffer = cmp->image.buf32 + (bbox.min.y * cmp->image.stride + bbox.min.x); auto dbuffer = cmp->image.buf32 + (bbox.min.y * cmp->image.stride + bbox.min.x);
for (uint32_t y = 0; y < h; ++y) { for (size_t y = 0; y < h; ++y) {
auto dst = dbuffer; auto dst = dbuffer;
for (uint32_t x = 0; x < w; ++x, ++dst) { for (size_t x = 0; x < w; ++x, ++dst) {
*dst = ALPHA_BLEND(color, MULTIPLY(opacity, A(*dst))); *dst = ALPHA_BLEND(color, MULTIPLY(opacity, A(*dst)));
} }
dbuffer += cmp->image.stride; dbuffer += cmp->image.stride;