From: Mikko Rasa Date: Sat, 14 Apr 2018 10:29:19 +0000 (+0300) Subject: Eliminate alignment from variable declarations X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=5ccf6cfbee39edce04c091a1863574adfcdfe968;p=ttf2png.git Eliminate alignment from variable declarations It causes trouble when adding variables with longer types than existing ones. Also reformat an incorrectly wrapped comment. --- diff --git a/ttf2png.c b/ttf2png.c index 770f0c6..96c3254 100644 --- a/ttf2png.c +++ b/ttf2png.c @@ -28,18 +28,18 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 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 @@ -52,13 +52,13 @@ 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(); @@ -75,25 +75,25 @@ char verbose = 0; 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; + 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; @@ -109,7 +109,7 @@ int main(int argc, char **argv) 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': @@ -359,11 +359,11 @@ int init_font(Font *font, FT_Face face, unsigned first, unsigned last, int autoh font->glyphs = NULL; for(i=first; i<=last; ++i) { - unsigned n; + unsigned n; FT_Bitmap *bmp = &face->glyph->bitmap; - unsigned x, y; - int flags = 0; - Glyph *glyph; + unsigned x, y; + int flags = 0; + Glyph *glyph; n = FT_Get_Char_Index(face, i); if(!n) @@ -459,7 +459,7 @@ int init_font(Font *font, FT_Face face, unsigned first, unsigned last, int autoh 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; @@ -533,7 +533,7 @@ int render_grid(Font *font, unsigned cellw, unsigned cellh, unsigned cpl, int se for(i=0; in_glyphs; ++i) { - Glyph *glyph; + Glyph *glyph; unsigned ci, cx, cy; unsigned x, y; @@ -568,8 +568,8 @@ int render_grid(Font *font, unsigned cellw, unsigned cellh, unsigned cpl, int se 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 = margin, cy; unsigned used_h = 0; @@ -615,12 +615,12 @@ int render_packed(Font *font, unsigned margin, unsigned padding) { 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. */ + /* Find the leftmost free pixel on this row. Also record the lowest + extent of glyphs to the left of the free position. */ for(; (cx+marginimage.w && used_pixels[cx]>cy); ++cx) if(used_pixels[cx]-cy-padding>target_h) target_h = used_pixels[cx]-cy-padding; @@ -702,7 +702,7 @@ int render_packed(Font *font, unsigned margin, unsigned padding) int save_defs(const char *fn, const Font *font) { - FILE *out; + FILE *out; unsigned i; out = fopen(fn, "w"); @@ -737,13 +737,13 @@ int save_defs(const char *fn, const Font *font) 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 = 0; - int color; + png_info *pngi; + png_byte **rows; + unsigned i; + png_byte *data2 = 0; + int color; if(!strcmp(fn, "-")) out = stdout;