Showing the changes to libmemdraw/string.c (1 of 39 files). Show all
Unified · Split
| @@ -13,7 +13,7 @@ memimagestring(Memimage *b, Point p, Memimage *color, Point cp, Memsubfont *f, c · 12 unmodified lines | |||
| 13 | Fontchar *i; | 13 | Fontchar *i; |
| 14 | 14 | ||
| 15 | s = (uchar*)cs; | 15 | s = (uchar*)cs; |
| 16 | for(; (c=*s); p.x+=width, cp.x+=width){ | 16 | for(; c=*s; p.x+=width, cp.x+=width){ |
| 17 | width = 0; | 17 | width = 0; |
| 18 | if(c < Runeself) | 18 | if(c < Runeself) |
| 19 | s++; | 19 | s++; |
| @@ -27,8 +27,7 @@ memimagestring(Memimage *b, Point p, Memimage *color, Point cp, Memsubfont *f, c · 7 unmodified lines | |||
| 27 | } | 27 | } |
| 28 | if(c >= f->n) | 28 | if(c >= f->n) |
| 29 | continue; | 29 | continue; |
| 30 | // i = f->info+c; | 30 | i = f->info+c; |
| 31 | i = &(f->info[c]); | ||
| 32 | width = i->width; | 31 | width = i->width; |
| 33 | memdraw(b, Rect(p.x+i->left, p.y+i->top, p.x+i->left+(i[1].x-i[0].x), p.y+i->bottom), | 32 | memdraw(b, Rect(p.x+i->left, p.y+i->top, p.x+i->left+(i[1].x-i[0].x), p.y+i->bottom), |
| 34 | color, cp, f->bits, Pt(i->x, i->top), SoverD); | 33 | color, cp, f->bits, Pt(i->x, i->top), SoverD); |
| @@ -47,7 +46,7 @@ memsubfontwidth(Memsubfont *f, char *cs) · 12 unmodified lines | |||
| 47 | 46 | ||
| 48 | p = Pt(0, f->height); | 47 | p = Pt(0, f->height); |
| 49 | s = (uchar*)cs; | 48 | s = (uchar*)cs; |
| 50 | for(; (c=*s); p.x+=width){ | 49 | for(; c=*s; p.x+=width){ |
| 51 | width = 0; | 50 | width = 0; |
| 52 | if(c < Runeself) | 51 | if(c < Runeself) |
| 53 | s++; | 52 | s++; |