Mercurial > hg > dmlib
diff tools/fontconv.c @ 1235:5b8245e5f785
Remove trailing whitespace.
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Fri, 06 Mar 2015 13:40:47 +0200 |
parents | 2b48b7fe95bc |
children | acae5f8ebc67 |
line wrap: on
line diff
--- a/tools/fontconv.c Fri Mar 06 13:38:53 2015 +0200 +++ b/tools/fontconv.c Fri Mar 06 13:40:47 2015 +0200 @@ -95,7 +95,7 @@ optArg); return FALSE; } - + optColor.r = colR; optColor.g = colG; optColor.b = colB; @@ -107,7 +107,7 @@ dmErrorMsg("Unknown argument '%s'.\n", currArg); return FALSE; } - + return TRUE; } @@ -124,7 +124,7 @@ dmErrorMsg("Too many filename arguments, '%s'\n", currArg); return FALSE; } - + return TRUE; } @@ -136,10 +136,10 @@ if (image->w < width || width < 2 || image->h < height || height < 2) return DMERR_INVALID_ARGS; - + xglyphs = image->w / width; yglyphs = image->h / height; - + if ((font = dmNewBitmapFont(xglyphs * yglyphs, width, height)) == NULL) return DMERR_MALLOC; @@ -147,7 +147,7 @@ image->w, image->h, width, height, xglyphs, yglyphs, xglyphs * yglyphs); - + nglyph = 0; for (yc = 0; yc < yglyphs; yc++) for (xc = 0; xc < xglyphs; xc++) @@ -158,7 +158,7 @@ image->format->Gmask, image->format->Bmask, image->format->Amask); - + if (glyph == NULL) { dmFreeBitmapFont(font); @@ -170,12 +170,12 @@ r.y = yc * height; r.w = width; r.h = height; - + SDL_BlitSurface(image, &r, glyph, NULL); - + font->glyphs[nglyph++] = glyph; } - + *pfont = font; return DMERR_OK; } @@ -299,7 +299,7 @@ } initTTF = TRUE; #endif - + // Open the source file if ((res = dmf_create_stdio(optInFilename, "rb", &inFile)) != DMERR_OK) { @@ -322,7 +322,7 @@ optSplitWidth, optSplitHeight); TTF_SetFontStyle(ttf, TTF_STYLE_NORMAL); - + if ((font = dmNewBitmapFont(256, optSplitWidth - 1, optSplitHeight+4)) == NULL) { goto error_exit; @@ -364,7 +364,7 @@ dmErrorMsg("No font loaded.\n"); goto error_exit; } - + dmMsg(1, "Outputting a DMFONT format bitmap font.\n"); if ((res = dmf_create_stdio(optOutFilename, "wb", &outFile)) != DMERR_OK) @@ -389,10 +389,10 @@ if (initTTF) TTF_Quit(); #endif - + dmf_close(inFile); dmFreeBitmapFont(font); SDL_FreeSurface(fontbmap); - + return 0; }