X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=ttf2png.c;h=0a66de26cc72f2c09772743db26f6eb7696cd5da;hb=a815ebe3941e2157639365806e9186e49ee944b5;hp=e890e33643084f7784c8d23e280555c425e8fec4;hpb=2bd053c9c2207a7c0afa2defee10568fde2e7c50;p=ttf2png.git diff --git a/ttf2png.c b/ttf2png.c index e890e33..0a66de2 100644 --- a/ttf2png.c +++ b/ttf2png.c @@ -78,9 +78,12 @@ void sort_and_compact_ranges(Range *, unsigned *); int range_cmp(const void *, const void *); unsigned round_to_pot(unsigned); void *alloc_image_data(size_t, size_t); -int init_font(Font *, FT_Face, const Range *, unsigned, bool); -int init_glyphs(Font *, FT_Face, const Range *, bool); +int init_font(Font *, FT_Face, const Range *, unsigned, bool, unsigned, unsigned); +int init_glyphs(Font *, FT_Face, const Range *, bool, unsigned, unsigned); int copy_bitmap(const FT_Bitmap *, Image *); +unsigned sqrti(unsigned); +unsigned find_distance_to_edge(const Image *, int, int, unsigned); +int create_distance_field(const FT_Bitmap *, Image *, unsigned, unsigned); int render_grid(Font *, unsigned, unsigned, unsigned, bool, bool); int render_packed(Font *, unsigned, unsigned, bool); int save_defs(const char *, const Font *); @@ -105,6 +108,8 @@ int main(int argc, char **argv) unsigned margin = 0; unsigned padding = 1; bool npot = 0; + unsigned distfield = 0; + unsigned border = 0; FT_Library freetype; FT_Face face; @@ -123,7 +128,7 @@ int main(int argc, char **argv) return 1; } - while((i = getopt(argc, argv, "r:s:l:c:o:atvh?ed:pim:n:f")) != -1) + while((i = getopt(argc, argv, "r:s:l:c:o:atvh?ed:pim:n:gf:b:")) != -1) { switch(i) { @@ -174,9 +179,15 @@ int main(int argc, char **argv) case 'n': padding = convert_numeric_option('n', 0); break; - case 'f': + case 'g': npot = 1; break; + case 'f': + distfield = convert_numeric_option('f', 1); + break; + case 'b': + border = convert_numeric_option('b', 1); + break; } } if(!strcmp(out_fn, "-")) @@ -213,6 +224,14 @@ int main(int argc, char **argv) printf("Glyphs: %ld\n", face->num_glyphs); } + font.size = size; + if(distfield) + { + if(!border) + border = sqrti(font.size); + size *= distfield; + } + err = FT_Set_Pixel_Sizes(face, 0, size); if(err) { @@ -230,8 +249,7 @@ int main(int argc, char **argv) else sort_and_compact_ranges(ranges, &n_ranges); - font.size = size; - err = init_font(&font, face, ranges, n_ranges, autohinter); + err = init_font(&font, face, ranges, n_ranges, autohinter, distfield, border); if(err) return 1; @@ -248,12 +266,12 @@ int main(int argc, char **argv) if(err) return 1; - if(invert) + if(invert || distfield) { for(i=0; (unsigned)i0 ? distfield : 1); - font->ascent = (face->size->metrics.ascender+63)/64; - font->descent = (face->size->metrics.descender-63)/64; + font->ascent = (face->size->metrics.ascender/scale+63)/64; + font->descent = (face->size->metrics.descender/scale-63)/64; if(verbose>=1) { @@ -514,7 +534,7 @@ int init_font(Font *font, FT_Face face, const Range *ranges, unsigned n_ranges, font->n_glyphs = 0; font->glyphs = NULL; for(i=0; i=1) @@ -543,7 +563,7 @@ int init_font(Font *font, FT_Face face, const Range *ranges, unsigned n_ranges, kern = &font->kerning[font->n_kerning++]; kern->left_code = font->glyphs[i].code; kern->right_code = font->glyphs[j].code; - kern->distance = (kerning.x+32)/64; + kern->distance = (kerning.x/scale+32)/64; } } @@ -553,10 +573,11 @@ int init_font(Font *font, FT_Face face, const Range *ranges, unsigned n_ranges, return 0; } -int init_glyphs(Font *font, FT_Face face, const Range *range, bool autohinter) +int init_glyphs(Font *font, FT_Face face, const Range *range, bool autohinter, unsigned distfield, unsigned border) { unsigned i, j; unsigned size = font->n_glyphs; + int scale = (distfield>0 ? distfield : 1); for(i=range->first; i<=range->last; ++i) { @@ -572,7 +593,7 @@ int init_glyphs(Font *font, FT_Face face, const Range *range, bool autohinter) if(autohinter) flags |= FT_LOAD_FORCE_AUTOHINT; FT_Load_Glyph(face, n, flags); - FT_Render_Glyph(face->glyph, FT_RENDER_MODE_NORMAL); + FT_Render_Glyph(face->glyph, (distfield ? FT_RENDER_MODE_MONO : FT_RENDER_MODE_NORMAL)); if(verbose>=2) { @@ -592,7 +613,7 @@ int init_glyphs(Font *font, FT_Face face, const Range *range, bool autohinter) printf(" (%s)", utf8); } - printf(": glyph %u, size %dx%d\n", n, bmp->width, bmp->rows); + printf(": glyph %u, size %dx%d\n", n, bmp->width/scale, bmp->rows/scale); } if(bmp->pixel_mode!=FT_PIXEL_MODE_GRAY && bmp->pixel_mode!=FT_PIXEL_MODE_MONO) @@ -610,15 +631,24 @@ int init_glyphs(Font *font, FT_Face face, const Range *range, bool autohinter) glyph = &font->glyphs[font->n_glyphs++]; glyph->index = n; glyph->code = i; - 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; + glyph->offset_x = (int)(face->glyph->bitmap_left+scale/2)/scale; + glyph->offset_y = (int)(face->glyph->bitmap_top-bmp->rows+scale/2)/scale; + glyph->advance = (int)(face->glyph->advance.x/scale+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. */ - if(copy_bitmap(bmp, &glyph->image)) - return -1; + if(distfield) + { + glyph->offset_x -= border; + glyph->offset_y -= border; + create_distance_field(bmp, &glyph->image, distfield, border); + } + else + { + if(copy_bitmap(bmp, &glyph->image)) + return -1; + } } return 0; @@ -671,6 +701,94 @@ int copy_bitmap(const FT_Bitmap *bmp, Image *image) return 0; } +unsigned sqrti(unsigned num) +{ + unsigned result = (num>0xFFFF ? 0xFFFF : 0x100); + while(result && result*result>=result+num) + result -= (result*result+result-num)/(result*2); + + return result; +} + +unsigned find_distance_to_edge(const Image *image, int origin_x, int origin_y, unsigned range) +{ + unsigned i, j; + int x, y; + unsigned char origin_pixel = 0; + unsigned closest = range*range; + + if(origin_x>=0 && (unsigned)origin_xw && origin_y>=0 && (unsigned)origin_yh) + origin_pixel = image->data[origin_x+origin_y*image->w]; + + x = origin_x-1; + y = origin_y-1; + for(i=1; (i=0 && (unsigned)xw && y>=0 && (unsigned)yh) + pixel = image->data[x+y*image->w]; + + if((pixel^origin_pixel)&0x80) + { + unsigned d = 2*i*i + k*k - 2*k*i; + if(dwidth || !bmp->rows) + { + image->w = 0; + image->h = 0; + image->data = NULL; + return 0; + } + + if(copy_bitmap(bmp, &base_image)) + return -1; + + image->w = (base_image.w-1)/scale+2*margin+1; + image->h = (base_image.h-1)/scale+2*margin+1; + image->data = (unsigned char *)malloc(image->w*image->h); + if(!image->data) + { + fprintf(stderr, "Cannot allocate %d bytes of memory for glyph\n", image->w*image->h); + free(base_image.data); + return -1; + } + + for(y=0; yh; ++y) for(x=0; xw; ++x) + { + int bx = (x-margin)*scale+scale/2; + int by = (y-margin)*scale+scale/2; + unsigned char pixel = find_distance_to_edge(&base_image, bx, by, margin*scale); + if(bx>=0 && (unsigned)bx=0 && (unsigned)bydata[x+y*image->w] = pixel; + } + + free(base_image.data); + + return 0; +} + int render_grid(Font *font, unsigned cellw, unsigned cellh, unsigned cpl, bool seq, bool npot) { unsigned i; @@ -805,18 +923,18 @@ int render_packed(Font *font, unsigned margin, unsigned padding, bool npot) area = a; } - /* Find an image size that's no higher than wide, allowing for some - imperfections in the packing. */ + /* Find an image size that's approximately square. */ for(font->image.w=1;; font->image.w<<=1) { if(font->image.w<=margin*2) continue; - font->image.h = (area*5/4)/(font->image.w-margin*2)+margin*2; + font->image.h = area/(font->image.w-margin*2)+margin*2; if(font->image.h<=font->image.w) break; } - if(!npot) - font->image.h = round_to_pot(font->image.h); + + /* Add some extra space to accommodate packing imperfections. */ + font->image.h = font->image.h*3/2; /* Allocate arrays for storing the image and keeping track of used pixels and glyphs. Since glyphs are rectangular and the image is filled starting from