X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=ttf2png.c;h=770f0c633119efc6a3e6219a287bb85de48a193e;hb=8092994319f38eda5005e2896d9bdffe583fec4a;hp=ebc0ccce76f43fee0e93b3c43d756bc129a900bc;hpb=9d1111afe554231e89dcaa574234ecd1813526a4;p=ttf2png.git diff --git a/ttf2png.c b/ttf2png.c index ebc0ccc..770f0c6 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 *, unsigned, unsigned); int save_defs(const char *, const Font *); int save_png(const char *, const Image *, char); @@ -85,6 +86,8 @@ int main(int argc, char **argv) char alpha = 0; char invert = 0; char pack = 0; + int margin = 0; + int padding = 1; FT_Library freetype; FT_Face face; @@ -103,7 +106,7 @@ int main(int argc, char **argv) return 1; } - while((i = getopt(argc, argv, "r:s:l:c:o:atvh?ed:pi")) != -1) + while((i = getopt(argc, argv, "r:s:l:c:o:atvh?ed:pim:n:")) != -1) { char *ptr; int temp; @@ -159,6 +162,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': @@ -189,6 +194,12 @@ int main(int argc, char **argv) case 'i': invert = 1; break; + case 'm': + margin = strtol(optarg, NULL, 0); + break; + case 'n': + padding = strtol(optarg, NULL, 0); + break; } } if(!strcmp(out_fn, "-")) @@ -233,23 +244,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, margin, padding); 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; (unsigned)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.1 - 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"); @@ -290,11 +299,49 @@ void usage() " -v Increase the level of verbosity\n" " -e Use cells in sequence, without gaps\n" " -p Pack the glyphs tightly instead of in a grid\n" + " -m Margin around image edges in packed mode [0]\n" + " -n Padding between packed glyphs [1]\n" " -d File name for writing glyph definitions\n" " -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(aglyph->bitmap; - int x, y; + unsigned x, y; int flags = 0; Glyph *glyph; @@ -348,13 +395,18 @@ void init_font(Font *font, FT_Face face, unsigned first, unsigned last, int auto glyph->image.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) @@ -400,9 +452,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; @@ -467,9 +521,14 @@ 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) @@ -502,26 +561,38 @@ void render_grid(Font *font, unsigned cellw, unsigned cellh, unsigned cpl, int s 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 margin, unsigned padding) { unsigned i; - unsigned area = 0; + size_t area = 0; char *used_glyphs; unsigned *used_pixels; - unsigned cx = 0, cy; + unsigned cx = margin, cy; unsigned used_h = 0; /* 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+padding)*(font->glyphs[i].image.h+padding); + if(aimage.w=1;; font->image.w<<=1) { - font->image.h = (area*5/4)/font->image.w; + if(font->image.w<=margin*2) + continue; + font->image.h = (area*5/4)/(font->image.w-margin*2)+margin*2; if(font->image.h<=font->image.w) break; } @@ -531,14 +602,16 @@ void render_packed(Font *font) glyphs. Since glyphs are rectangular and the image is filled starting from the top, it's enough to track the number of used pixels at the top of each column. */ - 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); 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); - for(cy=0; cyimage.h;) + for(cy=margin; cy+marginimage.h;) { unsigned w; unsigned x, y; @@ -548,19 +621,19 @@ void render_packed(Font *font) /* Find the leftmost free pixel on this row. Also record the lowest extent of glyphs to the left of the free position. */ - for(; (cximage.w && used_pixels[cx]>cy); ++cx) - if(used_pixels[cx]-cy-1>target_h) - target_h = used_pixels[cx]-cy-1; + for(; (cx+marginimage.w && used_pixels[cx]>cy); ++cx) + if(used_pixels[cx]-cy-padding>target_h) + target_h = used_pixels[cx]-cy-padding; - if(cx>=font->image.w) + if(cx+margin>=font->image.w) { - cx = 0; + cx = margin; ++cy; continue; } /* Count the free pixel at this position. */ - for(w=0; (cx+wimage.w && used_pixels[cx+w]<=cy); ++w) ; + for(w=0; (cx+w+marginimage.w && used_pixels[cx+w]<=cy); ++w) ; /* Find a suitable glyph to put here. */ for(i=0; in_glyphs; ++i) @@ -575,7 +648,7 @@ void render_packed(Font *font) /* Prefer glyphs that would reach exactly as low as the ones left of here. This aims to create a straight edge at the bottom for lining up further glyphs. */ - score = g->image.h+1; + score = g->image.h+padding; if(g->image.h==target_h) score *= g->image.w; else @@ -605,21 +678,26 @@ void render_packed(Font *font) continue; font->image.data[cx+x+(cy+y)*font->image.w] = 255-glyph->image.data[x+y*glyph->image.w]; } - for(x=0; ximage.w+2; ++x) + for(x=0; ximage.w+2*padding; ++x) { - if(cx+x<1 || cx+x>font->image.w) + if(cx+x=font->image.w+padding) continue; - if(used_pixels[cx+x-1]image.h+1) - used_pixels[cx+x-1] = cy+glyph->image.h+1; + if(used_pixels[cx+x-padding]image.h+padding) + used_pixels[cx+x-padding] = cy+glyph->image.h+padding; } - if(cy+glyph->image.h>used_h) - used_h = cy+glyph->image.h; + if(cy+glyph->image.h+margin>used_h) + used_h = cy+glyph->image.h+margin; } /* 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) @@ -664,7 +742,7 @@ int save_png(const char *fn, const Image *image, char alpha) png_info *pngi; png_byte **rows; unsigned i; - png_byte *data2; + png_byte *data2 = 0; int color; if(!strcmp(fn, "-")) @@ -697,7 +775,9 @@ int save_png(const char *fn, const Image *image, char alpha) 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;