Skip to content

Commit c41c33d

Browse files
committed
FIX: 'for' loop initial declarations
1 parent a8fbea0 commit c41c33d

File tree

1 file changed

+19
-15
lines changed

1 file changed

+19
-15
lines changed

src/core/u-image-blur.c

+19-15
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ static void boxes_for_gauss(REBDEC sigma, REBINT sizes[3])
4545
REBDEC mIdeal;
4646
REBINT m;
4747
REBINT n = 3;
48+
REBINT i;
4849

4950
wIdeal = sqrt((REBDEC)(12 * sigma * sigma / n) + 1); /* Ideal averaging filter width */
5051
wl = (REBINT)floor(wIdeal);
@@ -55,7 +56,7 @@ static void boxes_for_gauss(REBDEC sigma, REBINT sizes[3])
5556
mIdeal = (12 * sigma * sigma - (REBDEC)wl * wl * n - 4.0 * n * wl - 3.0 * n) / (-4.0 * wl - 4);
5657
m = (REBINT)round(mIdeal);
5758

58-
for (REBINT i = 0; i < n; i++)
59+
for (i = 0; i < n; i++)
5960
{
6061
if (i < m)
6162
{
@@ -70,36 +71,37 @@ static void boxes_for_gauss(REBDEC sigma, REBINT sizes[3])
7071

7172
static void box_blur_H(REBYTE *scl, REBYTE*tcl, REBINT w, REBINT h, REBINT r, REBINT bpp)
7273
{
73-
for (REBINT i = 0; i < h; i++)
74+
REBINT i, j, k, ti, li, ri, fv, lv, val;
75+
for (i = 0; i < h; i++)
7476
{
75-
for (REBINT k = 0; k < bpp; k++)
77+
for (k = 0; k < bpp; k++)
7678
{
77-
REBINT ti = i * w * bpp + k;
78-
REBINT li = ti;
79-
REBINT ri = ti + r * bpp;
80-
REBINT fv = scl[li];
81-
REBINT lv = scl[ti + (w - 1) * bpp];
82-
REBINT val = (r + 1) * fv;
83-
for (REBINT j = 0; j < r; j++)
79+
ti = i * w * bpp + k;
80+
li = ti;
81+
ri = ti + r * bpp;
82+
fv = scl[li];
83+
lv = scl[ti + (w - 1) * bpp];
84+
val = (r + 1) * fv;
85+
for (j = 0; j < r; j++)
8486
{
8587
val += scl[ti + (j * bpp)];
8688
}
87-
for (REBINT j = 0; j <= r; j++)
89+
for (j = 0; j <= r; j++)
8890
{
8991
val += scl[ri] - fv;
9092
tcl[ti] = (REBYTE)round(val / (r + r + 1));
9193
ri += bpp;
9294
ti += bpp;
9395
}
94-
for (REBINT j = r + 1; j < (w - r); j++)
96+
for (j = r + 1; j < (w - r); j++)
9597
{
9698
val += scl[ri] - scl[li];
9799
tcl[ti] = (REBYTE)round(val / (r + r + 1));
98100
li += bpp;
99101
ri += bpp;
100102
ti += bpp;
101103
}
102-
for (REBINT j = w - r; j < w; j++)
104+
for (j = w - r; j < w; j++)
103105
{
104106
val += lv - scl[li];
105107
tcl[ti] = (REBYTE)round(val / (r + r + 1));
@@ -155,7 +157,8 @@ static void box_blur_T(REBYTE*scl, REBYTE*tcl, REBINT w, REBINT h, REBINT r, REB
155157

156158
static void box_blur(REBYTE*scl, REBYTE*tcl, REBINT w, REBINT h, REBINT r, REBINT bpp)
157159
{
158-
for (REBINT i = 0; i < (h * w * bpp); i++)
160+
REBINT i;
161+
for (i = 0; i < (h * w * bpp); i++)
159162
{
160163
tcl[i] = scl[i];
161164
}
@@ -165,13 +168,14 @@ static void box_blur(REBYTE*scl, REBYTE*tcl, REBINT w, REBINT h, REBINT r, REBIN
165168

166169
void fast_gauss_blur(REBYTE*scl, REBYTE*tcl, REBINT w, REBINT h, REBINT r, REBINT bpp)
167170
{
171+
REBINT i;
168172
REBINT bxs[3];
169173
boxes_for_gauss(r, bxs);
170174
box_blur(scl, tcl, w, h, (bxs[0] - 1) / 2, bpp);
171175
box_blur(tcl, scl, w, h, (bxs[1] - 1) / 2, bpp);
172176
box_blur(scl, tcl, w, h, (bxs[2] - 1) / 2, bpp);
173177
// result would be in tcl, so copy it back to source, as it is modified anyway
174-
for (REBINT i = 0; i < (h * w * bpp); i++)
178+
for (i = 0; i < (h * w * bpp); i++)
175179
{
176180
scl[i] = tcl[i];
177181
}

0 commit comments

Comments
 (0)