diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-02-20 22:24:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-20 22:24:58 +0100 |
| commit | 8107fc98b6ceae749b3c10e6f0432e904961867b (patch) | |
| tree | 6c0ab829b02aba47ff3dc27b9a14d3c3a0658a3b /core/image.cpp | |
| parent | 132e2f458df7a3551a251d68afeccd0362ca6be2 (diff) | |
| parent | 8d51618949d5ea8a94e0f504401e8f852a393968 (diff) | |
Merge pull request #25853 from marxin/fix-25316-wshadow-local
Add -Wshadow=local to warnings and fix reported issues (#25316).
Diffstat (limited to 'core/image.cpp')
| -rw-r--r-- | core/image.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/core/image.cpp b/core/image.cpp index 3d48db872c..5a287ca50e 100644 --- a/core/image.cpp +++ b/core/image.cpp @@ -2901,15 +2901,15 @@ void Image::fix_alpha_edges() { if (dist >= closest_dist) continue; - const uint8_t *rp = &srcptr[(k * width + l) << 2]; + const uint8_t *rp2 = &srcptr[(k * width + l) << 2]; - if (rp[3] < alpha_threshold) + if (rp2[3] < alpha_threshold) continue; closest_dist = dist; - closest_color[0] = rp[0]; - closest_color[1] = rp[1]; - closest_color[2] = rp[2]; + closest_color[0] = rp2[0]; + closest_color[1] = rp2[1]; + closest_color[2] = rp2[2]; } } |