Generate only as tall image as needed in sequantial grid mode

[ttf2png.git] / ttf2png.c

diff --git a/ttf2png.c b/ttf2png.c
index 9714ecd24a32ee95b99f009a6ea29d7d2cb9d38a..8fc211e4900fd73b6f41711075a6162de8034663 100644 (file)
--- a/ttf2png.c
+++ b/ttf2png.c
@@ -273,7 +273,7 @@ int main(int argc, char **argv)
 
 void usage()
 {
-       printf("ttf2png - True Type Font to PNG converter\n"
+       printf("ttf2png 1.0 - True Type Font to PNG converter\n"
                "Copyright (c) 2004-2008  Mikko Rasa, Mikkosoft Productions\n"
                "Distributed under the GNU General Public License\n\n");
 
@@ -511,7 +511,10 @@ int render_grid(Font *font, unsigned cellw, unsigned cellh, unsigned cpl, int se
        last = font->glyphs[font->n_glyphs-1].code;
 
        font->image.w = round_to_pot(cpl*cellw);
-       font->image.h = round_to_pot((last-first+cpl)/cpl*cellh);
+       if(seq)
+               font->image.h = round_to_pot((font->n_glyphs+cpl-1)/cpl*cellh);
+       else
+               font->image.h = round_to_pot((last-first+cpl)/cpl*cellh);
 
        font->image.data = (char *)alloc_image_data(font->image.w, font->image.h);
        if(!font->image.data)