diff options
Diffstat (limited to 'libass')
-rw-r--r-- | libass/Makefile.am | 2 | ||||
-rw-r--r-- | libass/ass.c | 2 | ||||
-rw-r--r-- | libass/ass_bitmap.c | 1 | ||||
-rw-r--r-- | libass/ass_blur.c | 3 | ||||
-rw-r--r-- | libass/ass_cache.c | 1 | ||||
-rw-r--r-- | libass/ass_compat.h | 29 | ||||
-rw-r--r-- | libass/ass_coretext.c | 1 | ||||
-rw-r--r-- | libass/ass_coretext.h | 2 | ||||
-rw-r--r-- | libass/ass_directwrite.c | 1 | ||||
-rw-r--r-- | libass/ass_directwrite.h | 2 | ||||
-rw-r--r-- | libass/ass_drawing.c | 3 | ||||
-rw-r--r-- | libass/ass_font.c | 1 | ||||
-rw-r--r-- | libass/ass_fontconfig.c | 1 | ||||
-rw-r--r-- | libass/ass_fontconfig.h | 2 | ||||
-rw-r--r-- | libass/ass_fontselect.c | 1 | ||||
-rw-r--r-- | libass/ass_library.c | 1 | ||||
-rw-r--r-- | libass/ass_parse.c | 1 | ||||
-rw-r--r-- | libass/ass_rasterizer.c | 3 | ||||
-rw-r--r-- | libass/ass_rasterizer_c.c | 3 | ||||
-rw-r--r-- | libass/ass_render.c | 1 | ||||
-rw-r--r-- | libass/ass_render.h | 5 | ||||
-rw-r--r-- | libass/ass_render_api.c | 2 | ||||
-rw-r--r-- | libass/ass_shaper.c | 1 | ||||
-rw-r--r-- | libass/ass_shaper.h | 2 | ||||
-rw-r--r-- | libass/ass_string.c | 3 | ||||
-rw-r--r-- | libass/ass_string.h | 2 | ||||
-rw-r--r-- | libass/ass_strtod.c | 3 | ||||
-rw-r--r-- | libass/ass_utils.c | 1 | ||||
-rw-r--r-- | libass/ass_utils.h | 2 |
29 files changed, 66 insertions, 16 deletions
diff --git a/libass/Makefile.am b/libass/Makefile.am index cef1291a..cf075bbd 100644 --- a/libass/Makefile.am +++ b/libass/Makefile.am @@ -30,7 +30,7 @@ libass_la_SOURCES = ass.c ass_cache.c ass_font.c ass_fontselect.c ass_render.c \ ass_drawing.h ass_cache_template.h ass_render.h \ ass_parse.c ass_parse.h ass_render_api.c ass_shaper.c \ ass_shaper.h ass_strtod.c ass_fontconfig.c ass_fontconfig.h \ - ass_string.h ass_string.c + ass_string.h ass_string.c ass_compat.h libass_la_LDFLAGS = -no-undefined -version-info $(LIBASS_LT_CURRENT):$(LIBASS_LT_REVISION):$(LIBASS_LT_AGE) libass_la_LDFLAGS += -export-symbols $(srcdir)/libass.sym diff --git a/libass/ass.c b/libass/ass.c index a0a6d473..e8bc843b 100644 --- a/libass/ass.c +++ b/libass/ass.c @@ -17,6 +17,7 @@ */ #include "config.h" +#include "ass_compat.h" #include <stdio.h> #include <stdlib.h> @@ -25,7 +26,6 @@ #include <errno.h> #include <sys/types.h> #include <sys/stat.h> -#include <unistd.h> #include <inttypes.h> #ifdef CONFIG_ICONV diff --git a/libass/ass_bitmap.c b/libass/ass_bitmap.c index f2480c87..2c354b32 100644 --- a/libass/ass_bitmap.c +++ b/libass/ass_bitmap.c @@ -19,6 +19,7 @@ */ #include "config.h" +#include "ass_compat.h" #include <stdlib.h> #include <string.h> diff --git a/libass/ass_blur.c b/libass/ass_blur.c index 023be038..870992eb 100644 --- a/libass/ass_blur.c +++ b/libass/ass_blur.c @@ -16,6 +16,9 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#include "config.h" +#include "ass_compat.h" + #include <math.h> #include <stdbool.h> diff --git a/libass/ass_cache.c b/libass/ass_cache.c index d1aaec09..d8c561e1 100644 --- a/libass/ass_cache.c +++ b/libass/ass_cache.c @@ -18,6 +18,7 @@ */ #include "config.h" +#include "ass_compat.h" #include <inttypes.h> #include <ft2build.h> diff --git a/libass/ass_compat.h b/libass/ass_compat.h new file mode 100644 index 00000000..dc3395e9 --- /dev/null +++ b/libass/ass_compat.h @@ -0,0 +1,29 @@ +/* + * Copyright (C) 2015 Oleg Oshmyan <chortos@inbox.lv> + * + * This file is part of libass. + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +#ifndef LIBASS_COMPAT_H +#define LIBASS_COMPAT_H + +#ifdef _MSC_VER +#define _CRT_NONSTDC_NO_DEPRECATE +#define _CRT_SECURE_NO_WARNINGS +#define _USE_MATH_DEFINES +#define inline __inline +#endif + +#endif /* LIBASS_COMPAT_H */ diff --git a/libass/ass_coretext.c b/libass/ass_coretext.c index 877018d5..fdc7bd1f 100644 --- a/libass/ass_coretext.c +++ b/libass/ass_coretext.c @@ -17,6 +17,7 @@ */ #include "config.h" +#include "ass_compat.h" #include <CoreFoundation/CoreFoundation.h> #include <CoreText/CoreText.h> diff --git a/libass/ass_coretext.h b/libass/ass_coretext.h index 07a49fa6..31edc5f7 100644 --- a/libass/ass_coretext.h +++ b/libass/ass_coretext.h @@ -16,8 +16,6 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include "config.h" - #include "ass_types.h" #include "ass_fontselect.h" diff --git a/libass/ass_directwrite.c b/libass/ass_directwrite.c index cc0f1eda..521447d1 100644 --- a/libass/ass_directwrite.c +++ b/libass/ass_directwrite.c @@ -18,6 +18,7 @@ #define COBJMACROS #include "config.h" +#include "ass_compat.h" #include <initguid.h> #include <ole2.h> diff --git a/libass/ass_directwrite.h b/libass/ass_directwrite.h index daf17ffe..acb2e194 100644 --- a/libass/ass_directwrite.h +++ b/libass/ass_directwrite.h @@ -16,8 +16,6 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include "config.h" - #include "ass_types.h" #include "ass_fontselect.h" diff --git a/libass/ass_drawing.c b/libass/ass_drawing.c index 4e982380..6c99428f 100644 --- a/libass/ass_drawing.c +++ b/libass/ass_drawing.c @@ -16,6 +16,9 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#include "config.h" +#include "ass_compat.h" + #include <ft2build.h> #include FT_OUTLINE_H #include FT_BBOX_H diff --git a/libass/ass_font.c b/libass/ass_font.c index b97567f1..7dd0e8cb 100644 --- a/libass/ass_font.c +++ b/libass/ass_font.c @@ -17,6 +17,7 @@ */ #include "config.h" +#include "ass_compat.h" #include <inttypes.h> #include <ft2build.h> diff --git a/libass/ass_fontconfig.c b/libass/ass_fontconfig.c index 184f0904..30a9d38a 100644 --- a/libass/ass_fontconfig.c +++ b/libass/ass_fontconfig.c @@ -17,6 +17,7 @@ */ #include "config.h" +#include "ass_compat.h" #ifdef CONFIG_FONTCONFIG diff --git a/libass/ass_fontconfig.h b/libass/ass_fontconfig.h index 6d4f5e9b..2db82d73 100644 --- a/libass/ass_fontconfig.h +++ b/libass/ass_fontconfig.h @@ -16,8 +16,6 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include "config.h" - #include "ass_types.h" #include "ass_fontselect.h" diff --git a/libass/ass_fontselect.c b/libass/ass_fontselect.c index b437000c..521b4d08 100644 --- a/libass/ass_fontselect.c +++ b/libass/ass_fontselect.c @@ -18,6 +18,7 @@ */ #include "config.h" +#include "ass_compat.h" #include <stdlib.h> #include <stdio.h> diff --git a/libass/ass_library.c b/libass/ass_library.c index a2945d86..6ee5f819 100644 --- a/libass/ass_library.c +++ b/libass/ass_library.c @@ -17,6 +17,7 @@ */ #include "config.h" +#include "ass_compat.h" #include <inttypes.h> #include <stdio.h> diff --git a/libass/ass_parse.c b/libass/ass_parse.c index c818e73b..e6db4224 100644 --- a/libass/ass_parse.c +++ b/libass/ass_parse.c @@ -17,6 +17,7 @@ */ #include "config.h" +#include "ass_compat.h" #include <stdio.h> #include <stdlib.h> diff --git a/libass/ass_rasterizer.c b/libass/ass_rasterizer.c index 8a0ee3bf..d8e86e84 100644 --- a/libass/ass_rasterizer.c +++ b/libass/ass_rasterizer.c @@ -16,6 +16,9 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#include "config.h" +#include "ass_compat.h" + #include "ass_utils.h" #include "ass_rasterizer.h" #include <assert.h> diff --git a/libass/ass_rasterizer_c.c b/libass/ass_rasterizer_c.c index bd378fba..324cdca6 100644 --- a/libass/ass_rasterizer_c.c +++ b/libass/ass_rasterizer_c.c @@ -16,6 +16,9 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#include "config.h" +#include "ass_compat.h" + #include "ass_utils.h" #include "ass_rasterizer.h" #include <assert.h> diff --git a/libass/ass_render.c b/libass/ass_render.c index e7a30600..7044335c 100644 --- a/libass/ass_render.c +++ b/libass/ass_render.c @@ -17,6 +17,7 @@ */ #include "config.h" +#include "ass_compat.h" #include <assert.h> #include <math.h> diff --git a/libass/ass_render.h b/libass/ass_render.h index b664c791..194c9068 100644 --- a/libass/ass_render.h +++ b/libass/ass_render.h @@ -30,9 +30,6 @@ #include "hb.h" #endif -// XXX: fix the inclusion mess so we can avoid doing this here -typedef struct ass_shaper ASS_Shaper; - #include "ass.h" #include "ass_font.h" #include "ass_bitmap.h" @@ -291,6 +288,8 @@ typedef struct { size_t composite_max_size; } CacheStore; +#include "ass_shaper.h" + struct ass_renderer { ASS_Library *library; FT_Library ftlibrary; diff --git a/libass/ass_render_api.c b/libass/ass_render_api.c index 975cd637..4f6b0633 100644 --- a/libass/ass_render_api.c +++ b/libass/ass_render_api.c @@ -18,6 +18,8 @@ */ #include "config.h" +#include "ass_compat.h" + #include "ass_render.h" static void ass_reconfigure(ASS_Renderer *priv) diff --git a/libass/ass_shaper.c b/libass/ass_shaper.c index 658d1ef7..31e36821 100644 --- a/libass/ass_shaper.c +++ b/libass/ass_shaper.c @@ -17,6 +17,7 @@ */ #include "config.h" +#include "ass_compat.h" #include "ass_shaper.h" #include "ass_render.h" diff --git a/libass/ass_shaper.h b/libass/ass_shaper.h index e6121d13..0d1dfc25 100644 --- a/libass/ass_shaper.h +++ b/libass/ass_shaper.h @@ -19,7 +19,7 @@ #ifndef LIBASS_SHAPER_H #define LIBASS_SHAPER_H -#include "config.h" +typedef struct ass_shaper ASS_Shaper; #include <fribidi.h> #include "ass_render.h" diff --git a/libass/ass_string.c b/libass/ass_string.c index bb755a61..0a086b12 100644 --- a/libass/ass_string.c +++ b/libass/ass_string.c @@ -16,6 +16,9 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#include "config.h" +#include "ass_compat.h" + #include "ass_string.h" static const char lowertab[] = { diff --git a/libass/ass_string.h b/libass/ass_string.h index 8944804b..7cda708d 100644 --- a/libass/ass_string.h +++ b/libass/ass_string.h @@ -16,8 +16,6 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include "config.h" - #include <stdlib.h> #ifndef ASS_STRING_H diff --git a/libass/ass_strtod.c b/libass/ass_strtod.c index 566f6e4a..856815c2 100644 --- a/libass/ass_strtod.c +++ b/libass/ass_strtod.c @@ -12,6 +12,9 @@ * */ +#include "config.h" +#include "ass_compat.h" + #include <stdlib.h> #include <errno.h> #include "ass_string.h" diff --git a/libass/ass_utils.c b/libass/ass_utils.c index 1614a32a..aca511bd 100644 --- a/libass/ass_utils.c +++ b/libass/ass_utils.c @@ -17,6 +17,7 @@ */ #include "config.h" +#include "ass_compat.h" #include <stddef.h> #include <stdlib.h> diff --git a/libass/ass_utils.h b/libass/ass_utils.h index 8938c304..867b3e3e 100644 --- a/libass/ass_utils.h +++ b/libass/ass_utils.h @@ -28,8 +28,6 @@ #include <errno.h> #include <math.h> -#include "config.h" - #ifdef CONFIG_ENCA #include <enca.h> #endif |