summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Andersson <tor.andersson@artifex.com>2017-04-24 11:26:10 +0200
committerTor Andersson <tor.andersson@artifex.com>2017-04-27 15:11:02 +0200
commit5030ba7ebf7b3706ac065deef750d647570525b3 (patch)
treeba8dcf6aa4676d86dd32522e201110e9c966fbc5
parent551a880de3f3e65366ae42a679d48cfb1e2d74eb (diff)
downloadmupdf-5030ba7ebf7b3706ac065deef750d647570525b3.tar.xz
Include "mupdf/ucdn.h" explicitly.
-rw-r--r--include/mupdf/fitz.h1
-rw-r--r--include/mupdf/ucdn.h (renamed from include/mupdf/fitz/ucdn.h)0
-rw-r--r--platform/gl/gl-app.h2
-rw-r--r--source/fitz/bidi.c1
-rw-r--r--source/fitz/font.c1
-rw-r--r--source/fitz/noto.c1
-rw-r--r--source/fitz/stext-device.c1
-rw-r--r--source/fitz/ucdn.c1
-rw-r--r--source/html/html-layout.c4
m---------thirdparty/harfbuzz0
10 files changed, 10 insertions, 2 deletions
diff --git a/include/mupdf/fitz.h b/include/mupdf/fitz.h
index 1d2e4ca5..a84304e9 100644
--- a/include/mupdf/fitz.h
+++ b/include/mupdf/fitz.h
@@ -17,7 +17,6 @@ extern "C" {
#include "mupdf/fitz/pool.h"
#include "mupdf/fitz/string-util.h"
#include "mupdf/fitz/tree.h"
-#include "mupdf/fitz/ucdn.h"
#include "mupdf/fitz/bidi.h"
#include "mupdf/fitz/xml.h"
diff --git a/include/mupdf/fitz/ucdn.h b/include/mupdf/ucdn.h
index b0377a7c..b0377a7c 100644
--- a/include/mupdf/fitz/ucdn.h
+++ b/include/mupdf/ucdn.h
diff --git a/platform/gl/gl-app.h b/platform/gl/gl-app.h
index df6a2f96..7bff257b 100644
--- a/platform/gl/gl-app.h
+++ b/platform/gl/gl-app.h
@@ -5,6 +5,8 @@ int win_open_file(char *buf, int len);
#endif
#include "mupdf/fitz.h"
+#include "mupdf/ucdn.h"
+
#include <GLFW/glfw3.h>
extern fz_context *ctx;
diff --git a/source/fitz/bidi.c b/source/fitz/bidi.c
index 84b75b49..8c56f23e 100644
--- a/source/fitz/bidi.c
+++ b/source/fitz/bidi.c
@@ -35,6 +35,7 @@
*/
#include "mupdf/fitz.h"
+#include "mupdf/ucdn.h"
#include "bidi-imp.h" /* standard bidi code interface */
/*
diff --git a/source/fitz/font.c b/source/fitz/font.c
index b9c05b8d..95f0933e 100644
--- a/source/fitz/font.c
+++ b/source/fitz/font.c
@@ -1,4 +1,5 @@
#include "fitz-imp.h"
+#include "mupdf/ucdn.h"
#include "font-imp.h"
diff --git a/source/fitz/noto.c b/source/fitz/noto.c
index c31db28f..226cb885 100644
--- a/source/fitz/noto.c
+++ b/source/fitz/noto.c
@@ -1,4 +1,5 @@
#include "mupdf/fitz.h"
+#include "mupdf/ucdn.h"
/*
Base 14 PDF fonts from URW.
diff --git a/source/fitz/stext-device.c b/source/fitz/stext-device.c
index d0d9d401..677ac4d6 100644
--- a/source/fitz/stext-device.c
+++ b/source/fitz/stext-device.c
@@ -1,4 +1,5 @@
#include "mupdf/fitz.h"
+#include "mupdf/ucdn.h"
/* Extract text into an unsorted span soup. */
diff --git a/source/fitz/ucdn.c b/source/fitz/ucdn.c
index 916d0ade..0ea99083 100644
--- a/source/fitz/ucdn.c
+++ b/source/fitz/ucdn.c
@@ -15,6 +15,7 @@
*/
#include "mupdf/fitz.h"
+#include "mupdf/ucdn.h"
typedef struct {
unsigned char category;
diff --git a/source/html/html-layout.c b/source/html/html-layout.c
index c8250e62..15d52c1b 100644
--- a/source/html/html-layout.c
+++ b/source/html/html-layout.c
@@ -1,5 +1,7 @@
-#include "mupdf/html.h"
+#include "mupdf/fitz.h"
+#include "mupdf/ucdn.h"
#include "mupdf/svg.h"
+#include "mupdf/html.h"
#include "hb.h"
#include "hb-ft.h"
diff --git a/thirdparty/harfbuzz b/thirdparty/harfbuzz
-Subproject e16d6acc198d7d088bcd445cc532b9c670e1e00
+Subproject 9fda4a5f7ad7f15f9426d8ce0703d91c2ea39d9