fix several number overflow issues - sent - simple plaintext presentation tool | |
git clone git://git.suckless.org/sent | |
Log | |
Files | |
Refs | |
README | |
LICENSE | |
--- | |
commit 84734c73e82b8b30e2eef82c192a53010fb2d35f | |
parent eb07f3dc10c9efa6272ae5177de74a7fc093cf51 | |
Author: Markus Teich <[email protected]> | |
Date: Tue, 17 Nov 2015 00:19:39 +0100 | |
fix several number overflow issues | |
Diffstat: | |
M sent.c | 6 +++--- | |
1 file changed, 3 insertions(+), 3 deletions(-) | |
--- | |
diff --git a/sent.c b/sent.c | |
@@ -318,7 +318,7 @@ void pngdraw(Image *img) | |
void getfontsize(Slide *s, unsigned int *width, unsigned int *height) | |
{ | |
- size_t i, j; | |
+ int i, j; | |
unsigned int curw, imax; | |
float lfac = linespacing * (s->linecount - 1) + 1; | |
@@ -326,7 +326,7 @@ void getfontsize(Slide *s, unsigned int *width, unsigned in… | |
for (j = NUMFONTSCALES - 1; j >= 0; j--) | |
if (fonts[j]->h * lfac <= xw.uh) | |
break; | |
- drw_setfontset(d, fonts[j]); | |
+ drw_setfontset(d, fonts[++j]); | |
/* fit width */ | |
*width = 0; | |
@@ -334,7 +334,7 @@ void getfontsize(Slide *s, unsigned int *width, unsigned in… | |
curw = drw_fontset_getwidth(d, s->lines[i]); | |
if (curw >= *width) | |
imax = i; | |
- while (j >= 0 && curw > xw.uw) { | |
+ while (j > 0 && curw > xw.uw) { | |
drw_setfontset(d, fonts[--j]); | |
curw = drw_fontset_getwidth(d, s->lines[i]); | |
} |