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

sw_engine raster: code refactoring.

Browse source 
keep the code thorvg convention.
This commit is contained in:
Hermet Park 2021-11-10 16:57:36 +09:00 • committed by Hermet Park
parent 8c4b679fb7
commit cffc87e7b1
3 changed files with 24 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
src/examples/images/test.tvg
View file

Binary file not shown.

24
src/lib/sw_engine/tvgSwRaster.cpp
View file

@ -788,7 +788,7 @@ static bool _rasterUpScaleImage(SwSurface* surface, const uint32_t *img, uint32_
static bool _rasterDownScaleImage(SwSurface* surface, const uint32_t *img, uint32_t w, uint32_t h, const SwBBox& region, const Matrix* invTransform, float scaling) static bool _rasterDownScaleImage(SwSurface* surface, const uint32_t *img, uint32_t w, uint32_t h, const SwBBox& region, const Matrix* invTransform, float scaling)
{ {
uint32_t halfScaling = static_cast<uint32_t>(0.5f / scaling); auto halfScaling = static_cast<uint32_t>(0.5f / scaling);
if (halfScaling == 0) halfScaling = 1; if (halfScaling == 0) halfScaling = 1;
for (auto y = region.min.y; y < region.max.y; ++y) { for (auto y = region.min.y; y < region.max.y; ++y) {
@ -1334,23 +1334,26 @@ void rasterUnpremultiply(SwSurface* surface)
bool rasterImage(SwSurface* surface, SwImage* image, const Matrix* transform, const SwBBox& bbox, uint32_t opacity) bool rasterImage(SwSurface* surface, SwImage* image, const Matrix* transform, const SwBBox& bbox, uint32_t opacity)
{ {
Matrix invTransform; Matrix invTransform;
float scaling = 1.0f; auto scaling = 1.0f;
bool transformed = false;
if (transform) { if (transform) {
if (!mathInverse(transform, &invTransform)) return false; if (!mathInverse(transform, &invTransform)) return false;
scaling = sqrtf((transform->e11 * transform->e11) + (transform->e21 * transform->e21)); scaling = sqrtf((transform->e11 * transform->e11) + (transform->e21 * transform->e21));
auto scalingY = sqrtf((transform->e22 * transform->e22) + (transform->e12 * transform->e12)); auto scalingY = sqrtf((transform->e22 * transform->e22) + (transform->e12 * transform->e12));
//TODO:If the x and y axis scaling is different, a separate algorithm for each axis should be applied. //TODO:If the x and y axis scaling is different, a separate algorithm for each axis should be applied.
if (scaling != scalingY) scaling = 1.0f; if (fabsf(scaling - scalingY) > FLT_EPSILON) scaling = 1.0f;
else transformed = true;
} else {
invTransform = {1, 0, 0, 0, 1, 0, 0, 0, 1};
} }
else invTransform = {1, 0, 0, 0, 1, 0, 0, 0, 1};
auto translucent = _translucent(surface, opacity); auto translucent = _translucent(surface, opacity);
const float downScalingFactor = 0.5f; auto downScalingFactor = 0.5f;
if (image->rle) { if (image->rle) {
//Fast track //Fast track
if (mathIdentity(transform)) { if (!transformed) {
//OPTIMIZE ME: Support non transformed image. Only shifted image can use these routines. //OPTIMIZE ME: Support non transformed image. Only shifted image can use these routines.
if (translucent) return _rasterTranslucentImageRle(surface, image->rle, image->data, image->w, image->h, opacity); if (translucent) return _rasterTranslucentImageRle(surface, image->rle, image->data, image->w, image->h, opacity);
return _rasterImageRle(surface, image->rle, image->data, image->w, image->h); return _rasterImageRle(surface, image->rle, image->data, image->w, image->h);
@ -1359,15 +1362,15 @@ bool rasterImage(SwSurface* surface, SwImage* image, const Matrix* transform, co
if (fabsf(scaling - 1.0f) <= FLT_EPSILON) return _rasterTranslucentImageRle(surface, image->rle, image->data, image->w, image->h, opacity, &invTransform); if (fabsf(scaling - 1.0f) <= FLT_EPSILON) return _rasterTranslucentImageRle(surface, image->rle, image->data, image->w, image->h, opacity, &invTransform);
else if (scaling < downScalingFactor) return _rasterTranslucentDownScaleImageRle(surface, image->rle, image->data, image->w, image->h, opacity, &invTransform, scaling); else if (scaling < downScalingFactor) return _rasterTranslucentDownScaleImageRle(surface, image->rle, image->data, image->w, image->h, opacity, &invTransform, scaling);
else return _rasterTranslucentUpScaleImageRle(surface, image->rle, image->data, image->w, image->h, opacity, &invTransform); else return _rasterTranslucentUpScaleImageRle(surface, image->rle, image->data, image->w, image->h, opacity, &invTransform);
} } else {
if (fabsf(scaling - 1.0f) <= FLT_EPSILON) return _rasterImageRle(surface, image->rle, image->data, image->w, image->h, &invTransform); if (fabsf(scaling - 1.0f) <= FLT_EPSILON) return _rasterImageRle(surface, image->rle, image->data, image->w, image->h, &invTransform);
else if (scaling < downScalingFactor) return _rasterDownScaleImageRle(surface, image->rle, image->data, image->w, image->h, &invTransform, scaling); else if (scaling < downScalingFactor) return _rasterDownScaleImageRle(surface, image->rle, image->data, image->w, image->h, &invTransform, scaling);
else return _rasterUpScaleImageRle(surface, image->rle, image->data, image->w, image->h, &invTransform); else return _rasterUpScaleImageRle(surface, image->rle, image->data, image->w, image->h, &invTransform);
} }
} }
else { } else {
//Fast track //Fast track
if (mathIdentity(transform)) { if (!transformed) {
//OPTIMIZE ME: Support non transformed image. Only shifted image can use these routines. //OPTIMIZE ME: Support non transformed image. Only shifted image can use these routines.
if (translucent) return _rasterTranslucentImage(surface, image->data, image->w, image->h, opacity, bbox); if (translucent) return _rasterTranslucentImage(surface, image->data, image->w, image->h, opacity, bbox);
return _rasterImage(surface, image->data, image->w, image->h, bbox); return _rasterImage(surface, image->data, image->w, image->h, bbox);
@ -1376,10 +1379,11 @@ bool rasterImage(SwSurface* surface, SwImage* image, const Matrix* transform, co
if (fabsf(scaling - 1.0f) <= FLT_EPSILON) return _rasterTranslucentImage(surface, image->data, image->w, image->h, opacity, bbox, &invTransform); if (fabsf(scaling - 1.0f) <= FLT_EPSILON) return _rasterTranslucentImage(surface, image->data, image->w, image->h, opacity, bbox, &invTransform);
else if (scaling < downScalingFactor) return _rasterTranslucentDownScaleImage(surface, image->data, image->w, image->h, opacity, bbox, &invTransform, scaling); else if (scaling < downScalingFactor) return _rasterTranslucentDownScaleImage(surface, image->data, image->w, image->h, opacity, bbox, &invTransform, scaling);
else return _rasterTranslucentUpScaleImage(surface, image->data, image->w, image->h, opacity, bbox, &invTransform); else return _rasterTranslucentUpScaleImage(surface, image->data, image->w, image->h, opacity, bbox, &invTransform);
} } else {
if (fabsf(scaling - 1.0f) <= FLT_EPSILON) return _rasterImage(surface, image->data, image->w, image->h, bbox, &invTransform); if (fabsf(scaling - 1.0f) <= FLT_EPSILON) return _rasterImage(surface, image->data, image->w, image->h, bbox, &invTransform);
else if (scaling < downScalingFactor) return _rasterDownScaleImage(surface, image->data, image->w, image->h, bbox, &invTransform, scaling); else if (scaling < downScalingFactor) return _rasterDownScaleImage(surface, image->data, image->w, image->h, bbox, &invTransform, scaling);
else return _rasterUpScaleImage(surface, image->data, image->w, image->h, bbox, &invTransform); else return _rasterUpScaleImage(surface, image->data, image->w, image->h, bbox, &invTransform);
} }
} }
}
} }

2
src/lib/tvgMath.h
View file

@ -31,13 +31,11 @@
static inline bool mathIdentity(const Matrix* m) static inline bool mathIdentity(const Matrix* m)
{ {
if (m) {
if (fabs(m->e11 - 1) > FLT_EPSILON || fabs(m->e12) > FLT_EPSILON || fabs(m->e13) > FLT_EPSILON || if (fabs(m->e11 - 1) > FLT_EPSILON || fabs(m->e12) > FLT_EPSILON || fabs(m->e13) > FLT_EPSILON ||
fabs(m->e21) > FLT_EPSILON || fabs(m->e22 - 1) > FLT_EPSILON || fabs(m->e23) > FLT_EPSILON || fabs(m->e21) > FLT_EPSILON || fabs(m->e22 - 1) > FLT_EPSILON || fabs(m->e23) > FLT_EPSILON ||
fabs(m->e31) > FLT_EPSILON || fabs(m->e32) > FLT_EPSILON || fabs(m->e33 - 1) > FLT_EPSILON) { fabs(m->e31) > FLT_EPSILON || fabs(m->e32) > FLT_EPSILON || fabs(m->e33 - 1) > FLT_EPSILON) {
return false; return false;
} }
}
return true; return true;
} }