X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=ttf2png.c;h=8fc211e4900fd73b6f41711075a6162de8034663;hb=4709d1e1e7da55da3215746fc07cffc6b6fe3c00;hp=e702c9fe9446859a99a45c209511f192da00c495;hpb=dde53369347a9b0a37823746166aac1f2a3eee7d;p=ttf2png.git diff --git a/ttf2png.c b/ttf2png.c index e702c9f..8fc211e 100644 --- a/ttf2png.c +++ b/ttf2png.c @@ -61,11 +61,12 @@ typedef struct sFont Image image; } Font; -unsigned round_to_pot(unsigned); void usage(); -void init_font(Font *, FT_Face, unsigned, unsigned, int); -void render_grid(Font *, unsigned, unsigned, unsigned, int); -void render_packed(Font *); +unsigned round_to_pot(unsigned); +void *alloc_image_data(size_t, size_t); +int init_font(Font *, FT_Face, unsigned, unsigned, int); +int render_grid(Font *, unsigned, unsigned, unsigned, int); +int render_packed(Font *); int save_defs(const char *, const Font *); int save_png(const char *, const Image *, char); @@ -159,6 +160,8 @@ int main(int argc, char **argv) cellw = strtol(optarg, &ptr, 0); if(ptr[0]=='x' && isdigit(ptr[1])) cellh = strtol(ptr+1, NULL, 0); + else + cellh = cellw; } break; case 'o': @@ -233,23 +236,33 @@ int main(int argc, char **argv) } font.size = size; - init_font(&font, face, begin, end, autohinter); + err = init_font(&font, face, begin, end, autohinter); + if(err) + return 1; + if(pack) - render_packed(&font); + err = render_packed(&font); else - render_grid(&font, cellw, cellh, cpl, seq); + err = render_grid(&font, cellw, cellh, cpl, seq); + if(err) + return 1; + if(invert) { - for(i=0; i>1; - n |= n>>2; - n |= n>>4; - n |= n>>8; - n |= n>>16; - - return n+1; -} - 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" - "Usage: ttf2png [options] \n\n" - "Accepted options (default values in [brackets])\n" + "Distributed under the GNU General Public License\n\n"); + + printf("Usage: ttf2png [options] \n\n"); + + printf("Accepted options (default values in [brackets])\n" " -r Range of characters to convert [0,255]\n" " -s Font size to use, in pixels [10]\n" " -l Number of characters to put in one line [auto]\n" " -c Character cell size, in pixels [auto]\n" - " -o Output file name (or - for stdout) [font.png]\n" - " -a Force autohinter\n" + " -o Output file name (or - for stdout) [font.png]\n"); + printf(" -a Force autohinter\n" " -t Render glyphs to alpha channel\n" " -i Invert colors of the glyphs\n" " -v Increase the level of verbosity\n" @@ -292,7 +295,43 @@ void usage() " -h Print this message\n"); } -void init_font(Font *font, FT_Face face, unsigned first, unsigned last, int autohinter) +unsigned round_to_pot(unsigned n) +{ + n -= 1; + n |= n>>1; + n |= n>>2; + n |= n>>4; + n |= n>>8; + n |= n>>16; + + return n+1; +} + +void *alloc_image_data(size_t a, size_t b) +{ + void *ptr; + + /* Carry out the multiplication manually so we can check for overflow. */ + while(b>1) + { + size_t c = a; + a *= 2; + if(b&1) + a += c; + if(aimage.w = bmp->width; glyph->image.h = bmp->rows; glyph->image.data = (char *)malloc(bmp->width*bmp->rows); + if(!glyph->image.data) + { + fprintf(stderr, "Cannot allocate %d bytes of memory for glyph\n", bmp->width*bmp->rows); + return -1; + } glyph->offset_x = face->glyph->bitmap_left; glyph->offset_y = face->glyph->bitmap_top-bmp->rows; glyph->advance = (int)(face->glyph->advance.x+32)/64; /* Copy the glyph image since FreeType uses a global buffer, which would be overwritten by the next glyph. Negative pitch means the scanlines - start from the bottom */ + start from the bottom. */ if(bmp->pitch<0) { for(y=0; yrows; ++y) for(x=0; xwidth; ++x) @@ -398,9 +442,11 @@ void init_font(Font *font, FT_Face face, unsigned first, unsigned last, int auto if(verbose>=1) printf("Loaded %d kerning pairs\n", font->n_kerning); + + return 0; } -void render_grid(Font *font, unsigned cellw, unsigned cellh, unsigned cpl, int seq) +int render_grid(Font *font, unsigned cellw, unsigned cellh, unsigned cpl, int seq) { unsigned i; int top = 0, bot = 0; @@ -443,7 +489,7 @@ void render_grid(Font *font, unsigned cellw, unsigned cellh, unsigned cpl, int s printf("Max size: %u x %u\n", maxw, maxh); printf("Y range: [%d %d]\n", bot, top); printf("Cell size: %u x %u\n", cellw, cellh); - if(maxw>cellw || top-bot>cellh) + if(maxw>cellw || (unsigned)(top-bot)>cellh) fprintf(stderr, "Warning: character size exceeds cell size\n"); } @@ -465,15 +511,20 @@ void render_grid(Font *font, unsigned cellw, unsigned cellh, unsigned cpl, int s 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 *)malloc(font->image.w*font->image.h); + font->image.data = (char *)alloc_image_data(font->image.w, font->image.h); + if(!font->image.data) + return -1; memset(font->image.data, 255, font->image.w*font->image.h); for(i=0; in_glyphs; ++i) { Glyph *glyph; - int ci, cx, cy; + unsigned ci, cx, cy; unsigned x, y; glyph = &font->glyphs[i]; @@ -495,17 +546,19 @@ void render_grid(Font *font, unsigned cellw, unsigned cellh, unsigned cpl, int s for(y=0; yimage.h; ++y) for(x=0; ximage.w; ++x) { - if(cx+x<0 || cx+x>=font->image.w || cy+y<0 || cy+y>=font->image.h) + if(cx+x>=font->image.w || cy+y>=font->image.h) continue; font->image.data[cx+x+(cy+y)*font->image.w] = 255-glyph->image.data[x+y*glyph->image.w]; } } + + return 0; } -void render_packed(Font *font) +int render_packed(Font *font) { unsigned i; - unsigned area = 0; + size_t area = 0; char *used_glyphs; unsigned *used_pixels; unsigned cx = 0, cy; @@ -513,7 +566,15 @@ void render_packed(Font *font) /* Compute the total area occupied by glyphs and padding. */ for(i=0; in_glyphs; ++i) - area += (font->glyphs[i].image.w+1)*(font->glyphs[i].image.h+1); + { + size_t a = area+(font->glyphs[i].image.w+1)*(font->glyphs[i].image.h+1); + if(aimage.data = (char *)malloc(font->image.w*font->image.h); + font->image.data = (char *)alloc_image_data(font->image.w, font->image.h); + if(!font->image.data) + return -1; memset(font->image.data, 255, font->image.w*font->image.h); used_pixels = (unsigned *)malloc(font->image.w*sizeof(unsigned)); memset(used_pixels, 0, font->image.w*sizeof(unsigned)); @@ -599,7 +662,7 @@ void render_packed(Font *font) for(y=0; yimage.h; ++y) for(x=0; ximage.w; ++x) { - if(cx+x<0 || cx+x>=font->image.w || cy+y<0 || cy+y>=font->image.h) + if(cx+x>=font->image.w || cy+y>=font->image.h) continue; font->image.data[cx+x+(cy+y)*font->image.w] = 255-glyph->image.data[x+y*glyph->image.w]; } @@ -618,6 +681,11 @@ void render_packed(Font *font) /* Trim the image to the actually used size, in case the original estimate was too pessimistic. */ font->image.h = round_to_pot(used_h); + + free(used_glyphs); + free(used_pixels); + + return 0; } int save_defs(const char *fn, const Font *font) @@ -660,9 +728,9 @@ int save_png(const char *fn, const Image *image, char alpha) FILE *out; png_struct *pngs; png_info *pngi; - png_byte *rows[image->h]; - int i; - png_byte *data2; + png_byte **rows; + unsigned i; + png_byte *data2 = 0; int color; if(!strcmp(fn, "-")) @@ -692,9 +760,12 @@ int save_png(const char *fn, const Image *image, char alpha) } png_init_io(pngs, out); + rows = (png_byte **)malloc(image->h*sizeof(png_byte *)); if(alpha) { - data2 = (png_byte *)malloc(image->w*image->h*2); + data2 = (png_byte *)alloc_image_data(image->w*2, image->h); + if(!data2) + return -1; for(i=0; iw*image->h; ++i) { data2[i*2] = 255; @@ -714,6 +785,7 @@ int save_png(const char *fn, const Image *image, char alpha) png_set_rows(pngs, pngi, rows); png_write_png(pngs, pngi, PNG_TRANSFORM_IDENTITY, NULL); png_destroy_write_struct(&pngs, &pngi); + free(rows); if(alpha) free(data2);