From 740c59debd7503cdab82a1530e1c778eace1cbf3 Mon Sep 17 00:00:00 2001 From: Hermet Park Date: Wed, 7 Oct 2020 10:36:59 +0900 Subject: [PATCH] sw_engine: code refactoring. clean code for compaction. --- src/lib/sw_engine/tvgSwFill.cpp | 3 --- src/lib/sw_engine/tvgSwRaster.cpp | 12 ++++-------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/src/lib/sw_engine/tvgSwFill.cpp b/src/lib/sw_engine/tvgSwFill.cpp index f585e505..6e90764c 100644 --- a/src/lib/sw_engine/tvgSwFill.cpp +++ b/src/lib/sw_engine/tvgSwFill.cpp @@ -211,8 +211,6 @@ static inline uint32_t _pixel(const SwFill* fill, float pos) void fillFetchRadial(const SwFill* fill, uint32_t* dst, uint32_t y, uint32_t x, uint32_t len) { - if (fill->radial.a < FLT_EPSILON) return; - //Rotation auto rx = (x + 0.5f - fill->radial.cx) * fill->sy; auto ry = (y + 0.5f - fill->radial.cy) * fill->sx; @@ -234,7 +232,6 @@ void fillFetchRadial(const SwFill* fill, uint32_t* dst, uint32_t y, uint32_t x, void fillFetchLinear(const SwFill* fill, uint32_t* dst, uint32_t y, uint32_t x, uint32_t offset, uint32_t len) { - if (fill->linear.len < FLT_EPSILON) return; //Rotation float rx = x + 0.5f; float ry = y + 0.5f; diff --git a/src/lib/sw_engine/tvgSwRaster.cpp b/src/lib/sw_engine/tvgSwRaster.cpp index ddb013bf..92c3f613 100644 --- a/src/lib/sw_engine/tvgSwRaster.cpp +++ b/src/lib/sw_engine/tvgSwRaster.cpp @@ -133,8 +133,7 @@ static bool _rasterSolidRle(SwSurface* surface, SwRleData* rle, uint32_t color) static bool _rasterLinearGradientRect(SwSurface* surface, const SwBBox& region, const SwFill* fill) { - if (!fill) return false; - if (fill->linear.len < FLT_EPSILON) return false; + if (!fill || fill->linear.len < FLT_EPSILON) return false; auto buffer = surface->buffer + (region.min.y * surface->stride) + region.min.x; auto h = static_cast(region.max.y - region.min.y); @@ -165,8 +164,7 @@ static bool _rasterLinearGradientRect(SwSurface* surface, const SwBBox& region, static bool _rasterRadialGradientRect(SwSurface* surface, const SwBBox& region, const SwFill* fill) { - if (!fill) return false; - if (fill->radial.a < FLT_EPSILON) return false; + if (!fill || fill->radial.a < FLT_EPSILON) return false; auto buffer = surface->buffer + (region.min.y * surface->stride) + region.min.x; auto h = static_cast(region.max.y - region.min.y); @@ -198,8 +196,7 @@ static bool _rasterRadialGradientRect(SwSurface* surface, const SwBBox& region, static bool _rasterLinearGradientRle(SwSurface* surface, SwRleData* rle, const SwFill* fill) { - if (!rle || !fill) return false; - if (fill->linear.len < FLT_EPSILON) return false; + if (!rle || !fill || fill->linear.len < FLT_EPSILON) return false; auto buf = static_cast(alloca(surface->w * sizeof(uint32_t))); if (!buf) return false; @@ -245,8 +242,7 @@ static bool _rasterLinearGradientRle(SwSurface* surface, SwRleData* rle, const S static bool _rasterRadialGradientRle(SwSurface* surface, SwRleData* rle, const SwFill* fill) { - if (!rle || !fill) return false; - if (fill->radial.a < FLT_EPSILON) return false; + if (!rle || !fill || fill->radial.a < FLT_EPSILON) return false; auto buf = static_cast(alloca(surface->w * sizeof(uint32_t))); if (!buf) return false;