summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOleg Oshmyan <chortos@inbox.lv>2014-04-27 06:48:47 +0100
committerOleg Oshmyan <chortos@inbox.lv>2015-09-17 23:37:09 +0300
commit4b86ddcaab63429c7ba52ca0db4745d11cb79b8e (patch)
tree48a91ef7edeef90bec8c7a5beb60df5b04ef94d4
parentc94f18212330005d8b42da886fda9158b85671a1 (diff)
downloadlibass-4b86ddcaab63429c7ba52ca0db4745d11cb79b8e.tar.bz2
libass-4b86ddcaab63429c7ba52ca0db4745d11cb79b8e.tar.xz
Move ASS_Shaper declaration to ass_shaper.h
-rw-r--r--libass/ass_render.h5
-rw-r--r--libass/ass_shaper.h2
2 files changed, 4 insertions, 3 deletions
diff --git a/libass/ass_render.h b/libass/ass_render.h
index b664c79..194c906 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_shaper.h b/libass/ass_shaper.h
index e6121d1..b27cd53 100644
--- a/libass/ass_shaper.h
+++ b/libass/ass_shaper.h
@@ -21,6 +21,8 @@
#include "config.h"
+typedef struct ass_shaper ASS_Shaper;
+
#include <fribidi.h>
#include "ass_render.h"