diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2012-10-17 19:39:34 +0200 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2012-10-17 19:39:34 +0200 |
| commit | 67dc7b21cae44627d0ee55aedb90e421f58ac9c9 (patch) | |
| tree | 408b2b6cd6995c1f705e654e1debe796918ad1cc /miscutils/fbsplash.c | |
| parent | 3aeb870b2284713a5f206bc40910b86da7d26966 (diff) | |
| download | busybox-w32-67dc7b21cae44627d0ee55aedb90e421f58ac9c9.tar.gz busybox-w32-67dc7b21cae44627d0ee55aedb90e421f58ac9c9.tar.bz2 busybox-w32-67dc7b21cae44627d0ee55aedb90e421f58ac9c9.zip | |
fbsplash: fix regression from e4fa7b7
commit e4fa7b7 (limit progress bar flicker) made the progress bar
counter unsigned causing i < 0 to never come true.
Signed-off-by: Timo Teräs <timo.teras@iki.fi>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'miscutils/fbsplash.c')
| -rw-r--r-- | miscutils/fbsplash.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/miscutils/fbsplash.c b/miscutils/fbsplash.c index 37ca66559..05a77da23 100644 --- a/miscutils/fbsplash.c +++ b/miscutils/fbsplash.c | |||
| @@ -312,8 +312,7 @@ static void fb_drawprogressbar(unsigned percent) | |||
| 312 | 312 | ||
| 313 | pos_x = left_x; | 313 | pos_x = left_x; |
| 314 | if (percent > 0) { | 314 | if (percent > 0) { |
| 315 | int y; | 315 | int i, y; |
| 316 | unsigned i; | ||
| 317 | 316 | ||
| 318 | // actual progress bar | 317 | // actual progress bar |
| 319 | pos_x += (unsigned)(width * percent) / 100; | 318 | pos_x += (unsigned)(width * percent) / 100; |
| @@ -325,7 +324,7 @@ static void fb_drawprogressbar(unsigned percent) | |||
| 325 | while (i >= 0) { | 324 | while (i >= 0) { |
| 326 | // draw one-line thick "rectangle" | 325 | // draw one-line thick "rectangle" |
| 327 | // top line will have gray lvl 200, bottom one 100 | 326 | // top line will have gray lvl 200, bottom one 100 |
| 328 | unsigned gray_level = 100 + i*100 / height; | 327 | unsigned gray_level = 100 + (unsigned)i*100 / height; |
| 329 | fb_drawfullrectangle( | 328 | fb_drawfullrectangle( |
| 330 | left_x, y, pos_x, y, | 329 | left_x, y, pos_x, y, |
| 331 | gray_level, gray_level, gray_level); | 330 | gray_level, gray_level, gray_level); |