X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=ttf2png.c;h=7e78e84d41de01b10cd4aaa0fd410a8e88ee2e4f;hb=dc56acaec174575c5c27f6135a40abca511bc88e;hp=c77cd5889509248390bd80dbeee0606586719c96;hpb=a63e33344928b7f767b97aced995a84ad9b53de0;p=ttf2png.git

diff --git a/ttf2png.c b/ttf2png.c
index c77cd58..7e78e84 100644
--- a/ttf2png.c
+++ b/ttf2png.c
@@ -362,14 +362,6 @@ void render_grid(Font *font, unsigned cellw, unsigned cellh, unsigned cpl, int s
 	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;
@@ -410,21 +402,21 @@ void render_grid(Font *font, unsigned cellw, unsigned cellh, unsigned cpl, int s
 
 	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);
@@ -465,13 +457,13 @@ void render_packed(Font *font)
 {
 	unsigned i;
 	unsigned area = 0;
-	unsigned last_h = 0xFFFF;
 	char     *used_glyphs;
 	char     *used_pixels;
 	unsigned cx = 0, cy;
+	unsigned used_h = 0;
 
 	for(i=0; i<font->n_glyphs; ++i)
-		area+=(font->glyphs[i].image.w+1)*(font->glyphs[i].image.h+1);
+		area += (font->glyphs[i].image.w+1)*(font->glyphs[i].image.h+1);
 
 	for(font->image.w=1;; font->image.w<<=1)
 	{
@@ -494,17 +486,24 @@ void render_packed(Font *font)
 		unsigned x, y;
 		Glyph    *glyph = NULL;
 		unsigned best_score = 0;
+		unsigned target_h = 0;
 
 		for(; (cx<font->image.w && used_pixels[cx+cy*font->image.w]); ++cx) ;
 		if(cx>=font->image.w)
 		{
 			cx = 0;
 			++cy;
-			last_h = 0xFFFF;
 			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(i=0; i<font->n_glyphs; ++i)
 		{
 			Glyph *g;
@@ -515,7 +514,7 @@ void render_packed(Font *font)
 				unsigned score;
 
 				score = g->image.h+1;
-				if(g->image.h==last_h)
+				if(g->image.h==target_h)
 					score *= g->image.w;
 				else
 					score += g->image.w;
@@ -551,8 +550,11 @@ void render_packed(Font *font)
 			used_pixels[cx+x-1+(cy+y-1)*font->image.w] = 1;
 		}
 
-		last_h = glyph->image.h;
+		if(cy+glyph->image.h>used_h)
+			used_h = cy+glyph->image.h;
 	}
+
+	font->image.h = round_to_pot(used_h);
 }
 
 int save_defs(const char *fn, const Font *font)