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_image(Image *, size_t, size_t);
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 render_grid(Font *, unsigned, unsigned, unsigned, bool);
+int render_packed(Font *, unsigned, unsigned);
int save_defs(const char *, const Font *);
-int save_png(const char *, const Image *, char);
+int save_png(const char *, const Image *, bool, bool, bool);
char verbose = 0;
}
if(pack)
- err = render_packed(&font, margin, padding, npot);
+ err = render_packed(&font, margin, padding);
else
- err = render_grid(&font, cellw, cellh, cpl, seq, npot);
+ err = render_grid(&font, cellw, cellh, cpl, seq);
if(err)
return 1;
- if(invert || distfield)
- {
- for(i=0; (unsigned)i<font.image.w*font.image.h; ++i)
- font.image.data[i] = 255-font.image.data[i];
- }
- err = save_png(out_fn, &font.image, (alpha && !distfield));
+ err = save_png(out_fn, &font.image, (alpha && !distfield), (invert || distfield), npot);
if(err)
return 1;
return n+1;
}
-void *alloc_image_data(size_t a, size_t b)
+int init_image(Image *image, size_t w, size_t h)
{
- void *ptr;
+ size_t s;
- /* Carry out the multiplication manually so we can check for overflow. */
- while(b>1)
+ image->w = w;
+ image->h = h;
+ image->data = NULL;
+
+ if(!image->w || !image->h)
+ return 0;
+
+ s = w*h;
+ if(s/h!=w)
{
- size_t c = a;
- a *= 2;
- if(b&1)
- a += c;
- if(a<c)
- {
- fprintf(stderr, "Cannot allocate %lu kbytes of memory for image\n", (unsigned long)(c/1024*b));
- return NULL;
- }
- b /= 2;
+ fprintf(stderr, "Cannot allocate memory for a %dx%d image\n", image->w, image->h);
+ return -1;
+ }
+
+ image->data = malloc(s);
+ if(!image->data)
+ {
+ fprintf(stderr, "Cannot allocate memory for a %dx%d image\n", image->w, image->h);
+ return -1;
}
- ptr = malloc(a);
- if(!ptr)
- fprintf(stderr, "Cannot allocate %lu kbytes of memory for image\n", (unsigned long)(a/1024*b));
- return ptr;
+
+ return 0;
}
int init_font(Font *font, FT_Face face, const Range *ranges, unsigned n_ranges, bool autohinter, unsigned distfield, unsigned border)
unsigned char *src;
unsigned char *dst;
- image->w = bmp->width;
- image->h = bmp->rows;
+ if(init_image(image, bmp->width, bmp->rows))
+ return -1;
if(!image->w || !image->h)
- {
- image->data = NULL;
return 0;
- }
-
- 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);
- return -1;
- }
if(bmp->pitch<0)
src = bmp->buffer+(bmp->rows-1)*-bmp->pitch;
unsigned x, y;
Image base_image;
- if(!bmp->width || !bmp->rows)
- {
- image->w = 0;
- image->h = 0;
- image->data = NULL;
+ if(init_image(image, (bmp->width+scale-1)/scale+2*margin, (bmp->rows+scale-1)/scale+2*margin))
+ return -1;
+ if(!image->w || !image->h)
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; y<image->h; ++y) for(x=0; x<image->w; ++x)
{
int bx = (x-margin)*scale+scale/2;
return 0;
}
-int render_grid(Font *font, unsigned cellw, unsigned cellh, unsigned cpl, bool seq, bool npot)
+int render_grid(Font *font, unsigned cellw, unsigned cellh, unsigned cpl, bool seq)
{
unsigned i;
int top = 0, bot = 0;
- unsigned first, last;
+ unsigned first, n_cells;
unsigned maxw = 0, maxh = 0;
/* Find extremes of the glyph images. */
}
first = font->glyphs[0].code;
- if(!seq)
- first -= first%cpl;
- last = font->glyphs[font->n_glyphs-1].code;
-
- font->image.w = cpl*cellw;
- if(!npot)
- font->image.w = round_to_pot(font->image.w);
if(seq)
- font->image.h = (font->n_glyphs+cpl-1)/cpl*cellh;
+ n_cells = font->n_glyphs;
else
- font->image.h = (last-first+cpl)/cpl*cellh;
- if(!npot)
- font->image.h = round_to_pot(font->image.h);
+ {
+ first -= first%cpl;
+ n_cells = font->glyphs[font->n_glyphs-1].code+1-first;
+ }
- font->image.data = (unsigned char *)alloc_image_data(font->image.w, font->image.h);
- if(!font->image.data)
+ if(init_image(&font->image, cpl*cellw, (n_cells+cpl-1)/cpl*cellh))
return -1;
- memset(font->image.data, 255, font->image.w*font->image.h);
+ memset(font->image.data, 0, font->image.w*font->image.h);
for(i=0; i<font->n_glyphs; ++i)
{
{
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];
+ font->image.data[cx+x+(cy+y)*font->image.w] = glyph->image.data[x+y*glyph->image.w];
}
}
return 0;
}
-int render_packed(Font *font, unsigned margin, unsigned padding, bool npot)
+int render_packed(Font *font, unsigned margin, unsigned padding)
{
unsigned i;
size_t area = 0;
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 = (unsigned char *)alloc_image_data(font->image.w, font->image.h);
- if(!font->image.data)
+ if(init_image(&font->image, font->image.w, font->image.h))
return -1;
- memset(font->image.data, 255, font->image.w*font->image.h);
+ memset(font->image.data, 0, 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);
{
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];
+ font->image.data[cx+x+(cy+y)*font->image.w] = glyph->image.data[x+y*glyph->image.w];
}
for(x=0; x<glyph->image.w+2*padding; ++x)
{
/* Trim the image to the actually used size, in case the original estimate
was too pessimistic. */
font->image.h = used_h;
- if(!npot)
- font->image.h = round_to_pot(font->image.h);
free(used_glyphs);
free(used_pixels);
return 0;
}
-int save_png(const char *fn, const Image *image, char alpha)
+int save_png(const char *fn, const Image *image, bool alpha, bool invert, bool npot)
{
FILE *out;
png_struct *pngs;
png_info *pngi;
- png_byte **rows;
- unsigned i;
- png_byte *data2 = NULL;
+ unsigned w, h;
+ png_byte *row;
+ unsigned x, y;
int color;
+ unsigned flip_bits = (invert==alpha ? 0xFF : 0x00);
+ unsigned char *src = image->data;
if(!strcmp(fn, "-"))
out = stdout;
return -1;
}
+ w = (npot ? image->w : round_to_pot(image->w));
+ h = (npot ? image->h : round_to_pot(image->h));
+ color = (alpha ? PNG_COLOR_TYPE_GRAY_ALPHA : PNG_COLOR_TYPE_GRAY);
+ png_set_IHDR(pngs, pngi, w, h, 8, color, PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT);
+
png_init_io(pngs, out);
- rows = (png_byte **)malloc(image->h*sizeof(png_byte *));
+ png_write_info(pngs, pngi);
+ row = (png_byte *)malloc(w*(1+alpha));
if(alpha)
{
- data2 = (png_byte *)alloc_image_data(image->w*2, image->h);
- if(!data2)
- return -1;
- for(i=0; i<image->w*image->h; ++i)
+ for(x=0; x<w; ++x)
{
- data2[i*2] = 255;
- data2[i*2+1] = 255-image->data[i];
+ row[x*2] = 255;
+ row[x*2+1] = flip_bits;
}
- for(i=0; i<image->h; ++i)
- rows[i] = (png_byte *)(data2+i*image->w*2);
- color = PNG_COLOR_TYPE_GRAY_ALPHA;
+ for(y=0; y<image->h; ++y)
+ {
+ for(x=0; x<image->w; ++x)
+ row[x*2+1] = *src++^flip_bits;
+ png_write_row(pngs, row);
+ }
+
+ for(x=0; x<w; ++x)
+ row[x*2+1] = 0;
}
else
{
- for(i=0; i<image->h; ++i)
- rows[i] = (png_byte *)(image->data+i*image->w);
- color = PNG_COLOR_TYPE_GRAY;
+ memset(row+image->w, flip_bits, w-image->w);
+ for(y=0; y<image->h; ++y)
+ {
+ for(x=0; x<image->w; ++x)
+ row[x] = *src++^flip_bits;
+ png_write_row(pngs, row);
+ }
+
+ memset(row, flip_bits, w);
}
- png_set_IHDR(pngs, pngi, image->w, image->h, 8, color, PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT);
- png_set_rows(pngs, pngi, rows);
- png_write_png(pngs, pngi, PNG_TRANSFORM_IDENTITY, NULL);
+
+ for(; y<h; ++y)
+ png_write_row(pngs, row);
+
+ png_write_end(pngs, pngi);
png_destroy_write_struct(&pngs, &pngi);
- free(rows);
- if(alpha)
- free(data2);
+ free(row);
if(verbose)
- printf("Saved %dx%d PNG image to %s\n", image->w, image->h, fn);
+ printf("Saved %dx%d PNG image to %s\n", w, h, fn);
fclose(out);