unsigned first, last;
unsigned maxw = 0, maxh = 0;
- for(i=1;; i<<=1)
- {
- first = font->glyphs[0].code&~(i-1);
- last = first+i-1;
- if(last>=font->glyphs[font->n_glyphs-1].code)
- break;
- }
-
for(i=0; i<font->n_glyphs; ++i)
{
int y;
if(cpl==0)
{
- unsigned count = (seq ? font->n_glyphs : last-first+1);
for(i=1;; i<<=1)
{
cpl = i/cellw;
- if(cpl>0 && (count+cpl-1)/cpl*cellh<=cpl*cellw)
+ if(cpl>0 && font->n_glyphs/cpl*cellh<=cpl*cellw)
break;
}
}
+ first = font->glyphs[0].code;
+ if(!seq)
+ first -= first%cpl;
+ last = font->glyphs[font->n_glyphs-1].code;
+
font->image.w = round_to_pot(cpl*cellw);
- if(seq && font->n_glyphs<last-first+1)
- font->image.h = (font->n_glyphs+cpl-1)/cpl*cellh;
- else
- font->image.h = (last-first+cpl)/cpl*cellh;
- font->image.h = round_to_pot(font->image.h);
+ font->image.h = round_to_pot((last-first+cpl)/cpl*cellh);
font->image.data = (char *)malloc(font->image.w*font->image.h);
memset(font->image.data, 255, font->image.w*font->image.h);
unsigned i;
unsigned area = 0;
char *used_glyphs;
- char *used_pixels;
+ unsigned *used_pixels;
unsigned cx = 0, cy;
unsigned used_h = 0;
font->image.data = (char *)malloc(font->image.w*font->image.h);
memset(font->image.data, 255, font->image.w*font->image.h);
- used_pixels = (char *)malloc(font->image.w*font->image.h);
- memset(used_pixels, 0, font->image.w*font->image.h);
+ used_pixels = (unsigned *)malloc(font->image.w*sizeof(unsigned));
+ memset(used_pixels, 0, font->image.w*sizeof(unsigned));
used_glyphs = (char *)malloc(font->n_glyphs);
memset(used_glyphs, 0, font->n_glyphs);
unsigned best_score = 0;
unsigned target_h = 0;
- for(; (cx<font->image.w && used_pixels[cx+cy*font->image.w]); ++cx) ;
+ for(; (cx<font->image.w && used_pixels[cx]>cy); ++cx)
+ if(used_pixels[cx]-cy-1>target_h)
+ target_h = used_pixels[cx]-cy-1;
+
if(cx>=font->image.w)
{
cx = 0;
++cy;
continue;
}
- for(w=0; (cx+w<font->image.w && !used_pixels[cx+w+cy*font->image.w]); ++w) ;
- for(x=0; x<cx; ++x)
- {
- for(y=0; (cy+y+1<font->image.h && used_pixels[cx-x+(cy+y+1)*font->image.w]); ++y) ;
- if(y>target_h)
- target_h = y;
- }
+ for(w=0; (cx+w<font->image.w && used_pixels[cx+w]<=cy); ++w) ;
for(i=0; i<font->n_glyphs; ++i)
{
continue;
font->image.data[cx+x+(cy+y)*font->image.w] = 255-glyph->image.data[x+y*glyph->image.w];
}
- for(y=0; y<glyph->image.h+2; ++y) for(x=0; x<glyph->image.w+2; ++x)
+ for(x=0; x<glyph->image.w+2; ++x)
{
- if(cx+x<1 || cx+x>font->image.w || cy+y<1 || cy+y>font->image.h)
+ if(cx+x<1 || cx+x>font->image.w)
continue;
- used_pixels[cx+x-1+(cy+y-1)*font->image.w] = 1;
+ if(used_pixels[cx+x-1]<cy+glyph->image.h+1)
+ used_pixels[cx+x-1] = cy+glyph->image.h+1;
}
if(cy+glyph->image.h>used_h)