typedef struct sImage
{
unsigned w, h;
- char *data;
+ char *data;
} Image;
typedef struct sGlyph
{
unsigned index;
unsigned code;
- Image image;
+ Image image;
unsigned x, y;
- int offset_x;
- int offset_y;
- int advance;
+ int offset_x;
+ int offset_y;
+ int advance;
} Glyph;
typedef struct sKerning
typedef struct sFont
{
unsigned size;
- int ascent;
- int descent;
+ int ascent;
+ int descent;
unsigned n_glyphs;
- Glyph *glyphs;
+ Glyph *glyphs;
unsigned n_kerning;
- Kerning *kerning;
- Image image;
+ Kerning *kerning;
+ Image image;
} Font;
void usage();
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 render_packed(Font *, unsigned, unsigned);
int save_defs(const char *, const Font *);
int save_png(const char *, const Image *, char);
int main(int argc, char **argv)
{
char *fn;
- int begin = 0;
- int end = 255;
- int size = 10;
- int cpl = 0;
- int cellw = 0;
- int cellh = 0;
+ int begin = 0;
+ int end = 255;
+ int size = 10;
+ int cpl = 0;
+ int cellw = 0;
+ int cellh = 0;
char autohinter = 0;
char seq = 0;
char alpha = 0;
char invert = 0;
char pack = 0;
+ int margin = 0;
+ int padding = 1;
FT_Library freetype;
- FT_Face face;
+ FT_Face face;
- int err;
- int i;
+ int err;
+ int i;
char *out_fn = "font.png";
char *def_fn = NULL;
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;
+ int temp;
switch(i)
{
case 'r':
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, "-"))
return 1;
if(pack)
- err = render_packed(&font);
+ err = render_packed(&font, margin, padding);
else
err = render_grid(&font, cellw, cellh, cpl, seq);
if(err)
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");
" -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");
}
a += c;
if(a<c)
{
- fprintf(stderr, "Cannot allocate %d kbytes of memory for image\n", c/1024*b);
+ fprintf(stderr, "Cannot allocate %lu kbytes of memory for image\n", (unsigned long)(c/1024*b));
return NULL;
}
b /= 2;
}
ptr = malloc(a);
if(!ptr)
- fprintf(stderr, "Cannot allocate %d kbytes of memory for image\n", a/1024*b);
+ fprintf(stderr, "Cannot allocate %lu kbytes of memory for image\n", (unsigned long)(a/1024*b));
return ptr;
}
font->glyphs = NULL;
for(i=first; i<=last; ++i)
{
- unsigned n;
+ unsigned n;
FT_Bitmap *bmp = &face->glyph->bitmap;
- int x, y;
- int flags = 0;
- Glyph *glyph;
+ unsigned x, y;
+ int flags = 0;
+ Glyph *glyph;
n = FT_Get_Char_Index(face, i);
if(!n)
int render_grid(Font *font, unsigned cellw, unsigned cellh, unsigned cpl, int seq)
{
unsigned i;
- int top = 0, bot = 0;
+ int top = 0, bot = 0;
unsigned first, last;
unsigned maxw = 0, maxh = 0;
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)
for(i=0; i<font->n_glyphs; ++i)
{
- Glyph *glyph;
+ Glyph *glyph;
unsigned ci, cx, cy;
unsigned x, y;
return 0;
}
-int render_packed(Font *font)
+int render_packed(Font *font, unsigned margin, unsigned padding)
{
unsigned i;
- size_t area = 0;
- char *used_glyphs;
+ 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; i<font->n_glyphs; ++i)
{
- size_t a = 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(a<area)
{
fprintf(stderr, "Overflow in counting total glyph area\n");
imperfections in the packing. */
for(font->image.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;
}
used_glyphs = (char *)malloc(font->n_glyphs);
memset(used_glyphs, 0, font->n_glyphs);
- for(cy=0; cy<font->image.h;)
+ for(cy=margin; cy+margin<font->image.h;)
{
unsigned w;
unsigned x, y;
- Glyph *glyph = NULL;
+ Glyph *glyph = NULL;
unsigned best_score = 0;
unsigned target_h = 0;
- /* Find the leftmost free pixel on this row. Also record the lowest extent of glyphs
- to the left of the free position. */
- for(; (cx<font->image.w && used_pixels[cx]>cy); ++cx)
- if(used_pixels[cx]-cy-1>target_h)
- target_h = used_pixels[cx]-cy-1;
+ /* Find the leftmost free pixel on this row. Also record the lowest
+ extent of glyphs to the left of the free position. */
+ for(; (cx+margin<font->image.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+w<font->image.w && used_pixels[cx+w]<=cy); ++w) ;
+ for(w=0; (cx+w+margin<font->image.w && used_pixels[cx+w]<=cy); ++w) ;
/* Find a suitable glyph to put here. */
for(i=0; i<font->n_glyphs; ++i)
/* 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
continue;
font->image.data[cx+x+(cy+y)*font->image.w] = 255-glyph->image.data[x+y*glyph->image.w];
}
- for(x=0; x<glyph->image.w+2; ++x)
+ for(x=0; x<glyph->image.w+2*padding; ++x)
{
- if(cx+x<1 || cx+x>font->image.w)
+ if(cx+x<padding || cx+x>=font->image.w+padding)
continue;
- if(used_pixels[cx+x-1]<cy+glyph->image.h+1)
- used_pixels[cx+x-1] = cy+glyph->image.h+1;
+ if(used_pixels[cx+x-padding]<cy+glyph->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
int save_defs(const char *fn, const Font *font)
{
- FILE *out;
+ FILE *out;
unsigned i;
out = fopen(fn, "w");
int save_png(const char *fn, const Image *image, char alpha)
{
- FILE *out;
+ FILE *out;
png_struct *pngs;
- png_info *pngi;
- png_byte **rows;
- unsigned i;
- png_byte *data2;
- int color;
+ png_info *pngi;
+ png_byte **rows;
+ unsigned i;
+ png_byte *data2 = 0;
+ int color;
if(!strcmp(fn, "-"))
out = stdout;
projects / ttf2png.git / blobdiff