mirror/mpv
0
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2024-09-20 12:02:23 +02:00
Code

fix overcomplicated macros and a few warnings

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13187 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
rathann 2004-08-28 20:53:01 +00:00
parent 520f3f4093
commit 0eb98079d5
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
TOOLS/subfont-c/subfont.c
View File

@ -74,12 +74,9 @@ iconv_t cd; // iconv conversion descriptor
#define eprintf(...) fprintf(stderr, __VA_ARGS__)
#define ERROR_(msg, ...) (eprintf("%s: error: " msg "\n", command, __VA_ARGS__), exit(1))
#define WARNING_(msg, ...) eprintf("%s: warning: " msg "\n", command, __VA_ARGS__)
#define ERROR(...) ERROR_(__VA_ARGS__, NULL)
#define WARNING(...) WARNING_(__VA_ARGS__, NULL)
#define eprintf(...) fprintf(stderr, ##__VA_ARGS__)
#define ERROR(msg, ...) eprintf("%s: error: " msg "\n", command, ##__VA_ARGS__),exit(1)
#define WARNING(msg, ...) eprintf("%s: warning: " msg "\n", command, ##__VA_ARGS__)
#define f266ToInt(x) (((x)+32)>>6) // round fractional fixed point number to integer
// coordinates are in 26.6 pixels (i.e. 1/64th of pixels)
@ -304,7 +301,7 @@ void render() {
glyph_index = FT_Get_Char_Index(face, uni_charmap ? character:code);
if (glyph_index==0) {
WARNING("Glyph for char 0x%02lx|U+%04lX|%c not found.", code, character,
code<' '||code>255 ? '.':code);
code<' '||code>255 ? '.':(char)code);
continue;
}
}
@ -368,7 +365,7 @@ void render() {
fprintf(f, "0x%04lx %i %i;\tU+%04lX|%c\n", unicode_desc ? character:code,
pen_x, // bitmap start
pen_xa-1, // bitmap end
character, code<' '||code>255 ? '.':code);
character, code<' '||code>255 ? '.':(char)code);
#endif
pen_x = ALIGN(pen_xa);
}