diff options
author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-08-07 10:36:07 +0000 |
---|---|---|
committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-08-07 10:36:07 +0000 |
commit | 4b3e09b125ec56c3668f53aa5a529c0fc3d650c9 (patch) | |
tree | 29e04d1b609e6420250c9aafcc8fffa8c9999e72 /libass | |
parent | 638a513ee6494d5349699fef9108614e1cfb8235 (diff) | |
download | libass-4b3e09b125ec56c3668f53aa5a529c0fc3d650c9.tar.bz2 libass-4b3e09b125ec56c3668f53aa5a529c0fc3d650c9.tar.xz |
Rename font-related preprocessor directives.
Switch them from a HAVE_ to a CONFIG_ prefix.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27425 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libass')
-rw-r--r-- | libass/ass.c | 12 | ||||
-rw-r--r-- | libass/ass_font.c | 2 | ||||
-rw-r--r-- | libass/ass_fontconfig.c | 8 | ||||
-rw-r--r-- | libass/ass_fontconfig.h | 2 | ||||
-rw-r--r-- | libass/ass_mp.c | 6 |
5 files changed, 15 insertions, 15 deletions
diff --git a/libass/ass.c b/libass/ass.c index 3f78afa9..1ee81773 100644 --- a/libass/ass.c +++ b/libass/ass.c @@ -32,7 +32,7 @@ #include <unistd.h> #include <inttypes.h> -#ifdef HAVE_ICONV +#ifdef CONFIG_ICONV #include <iconv.h> #endif @@ -810,7 +810,7 @@ void ass_process_chunk(ass_track_t* track, char *data, int size, long long timec free(str); } -#ifdef HAVE_ICONV +#ifdef CONFIG_ICONV /** \brief recode buffer to utf-8 * constraint: codepage != 0 * \param data pointer to text buffer @@ -826,7 +826,7 @@ static char* sub_recode(char* data, size_t size, char* codepage) { const char* cp_tmp = codepage; -#ifdef HAVE_ENCA +#ifdef CONFIG_ENCA char enca_lang[3], enca_fallback[100]; if (sscanf(codepage, "enca:%2s:%99s", enca_lang, enca_fallback) == 2 || sscanf(codepage, "ENCA:%2s:%99s", enca_lang, enca_fallback) == 2) { @@ -991,7 +991,7 @@ ass_track_t* ass_read_memory(ass_library_t* library, char* buf, size_t bufsize, if (!buf) return 0; -#ifdef HAVE_ICONV +#ifdef CONFIG_ICONV if (codepage) buf = sub_recode(buf, bufsize, codepage); if (!buf) @@ -1017,7 +1017,7 @@ char* read_file_recode(char* fname, char* codepage, int* size) buf = read_file(fname, &bufsize); if (!buf) return 0; -#ifdef HAVE_ICONV +#ifdef CONFIG_ICONV if (codepage) { char* tmpbuf = sub_recode(buf, bufsize, codepage); free(buf); @@ -1071,7 +1071,7 @@ int ass_read_styles(ass_track_t* track, char* fname, char* codepage) buf = read_file(fname, &sz); if (!buf) return 1; -#ifdef HAVE_ICONV +#ifdef CONFIG_ICONV if (codepage) { char* tmpbuf; tmpbuf = sub_recode(buf, sz, codepage); diff --git a/libass/ass_font.c b/libass/ass_font.c index f70b7c59..f2214a34 100644 --- a/libass/ass_font.c +++ b/libass/ass_font.c @@ -284,7 +284,7 @@ FT_Glyph ass_font_get_glyph(void* fontconfig_priv, ass_font_t* font, uint32_t ch break; } -#ifdef HAVE_FONTCONFIG +#ifdef CONFIG_FONTCONFIG if (index == 0) { int face_idx; mp_msg(MSGT_ASS, MSGL_INFO, MSGTR_LIBASS_GlyphNotFoundReselectingFont, diff --git a/libass/ass_fontconfig.c b/libass/ass_fontconfig.c index 6cf59ff1..fa150876 100644 --- a/libass/ass_fontconfig.c +++ b/libass/ass_fontconfig.c @@ -37,13 +37,13 @@ #include "ass_library.h" #include "ass_fontconfig.h" -#ifdef HAVE_FONTCONFIG +#ifdef CONFIG_FONTCONFIG #include <fontconfig/fontconfig.h> #include <fontconfig/fcfreetype.h> #endif struct fc_instance_s { -#ifdef HAVE_FONTCONFIG +#ifdef CONFIG_FONTCONFIG FcConfig* config; #endif char* family_default; @@ -51,7 +51,7 @@ struct fc_instance_s { int index_default; }; -#ifdef HAVE_FONTCONFIG +#ifdef CONFIG_FONTCONFIG // 4yo fontconfig does not have these. // They are only needed for debug output, anyway. @@ -474,7 +474,7 @@ fc_instance_t* fontconfig_init(ass_library_t* library, FT_Library ftlibrary, con return priv; } -#else // HAVE_FONTCONFIG +#else /* CONFIG_FONTCONFIG */ char* fontconfig_select(fc_instance_t* priv, const char* family, unsigned bold, unsigned italic, int* index, uint32_t code) diff --git a/libass/ass_fontconfig.h b/libass/ass_fontconfig.h index 83e61235..e9a1ce15 100644 --- a/libass/ass_fontconfig.h +++ b/libass/ass_fontconfig.h @@ -28,7 +28,7 @@ #include <ft2build.h> #include FT_FREETYPE_H -#ifdef HAVE_FONTCONFIG +#ifdef CONFIG_FONTCONFIG #include <fontconfig/fontconfig.h> #endif diff --git a/libass/ass_mp.c b/libass/ass_mp.c index 2e56a935..ae6d3943 100644 --- a/libass/ass_mp.c +++ b/libass/ass_mp.c @@ -32,7 +32,7 @@ #include "ass_mp.h" #include "ass_library.h" -#ifdef HAVE_FONTCONFIG +#ifdef CONFIG_FONTCONFIG #include <fontconfig/fontconfig.h> #endif @@ -55,7 +55,7 @@ char* ass_border_color = NULL; char* ass_styles_file = NULL; int ass_hinting = ASS_HINTING_NATIVE + 4; // native hinting for unscaled osd -#ifdef HAVE_FONTCONFIG +#ifdef CONFIG_FONTCONFIG extern int font_fontconfig; #else static int font_fontconfig = -1; @@ -65,7 +65,7 @@ extern char* sub_font_name; extern float text_font_scale_factor; extern int subtitle_autoscale; -#ifdef HAVE_ICONV +#ifdef CONFIG_ICONV extern char* sub_cp; #else static char* sub_cp = 0; |