From 794a8bce7716bf4571ca24c2574caa0f73851aa3 Mon Sep 17 00:00:00 2001
From: malc <moosotc@gmail.com>
Date: Thu, 24 Mar 2016 21:18:17 +0300
Subject: [PATCH] Sync with upstream

---
 BUILDING | 2 +-
 glfont.c | 2 +-
 link.c   | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/BUILDING b/BUILDING
index a0db526..6823867 100644
--- a/BUILDING
+++ b/BUILDING
@@ -1,7 +1,7 @@
 Prerequisites for building from sources:
         mupdf         [http://mupdf.com/]
                        git://git.ghostscript.com/mupdf.git
-                       commit d8125a13c05eef69a3fd3b6a9512dc573b23cc05
+                       commit 321a6cbd2e4f3bd576ca0fd7a883f194742d0ec7
         ocaml (4.02+) [http://ocaml.org/]
         gcc           [https://gcc.gnu.org/]
         binutils      [http://www.gnu.org/software/binutils/]
diff --git a/glfont.c b/glfont.c
index 01617fb..019a33f 100644
--- a/glfont.c
+++ b/glfont.c
@@ -120,7 +120,7 @@ static FT_Face load_font(char *fontname)
         return face;
 }
 
-static FT_Face UNUSED_ATTR load_builtin_font(void *base, int len)
+static FT_Face UNUSED_ATTR load_builtin_font(const void *base, int len)
 {
         FT_Face face;
         int code;
diff --git a/link.c b/link.c
index 22c08b3..02d6953 100644
--- a/link.c
+++ b/link.c
@@ -4717,10 +4717,10 @@ CAMLprim value ml_init (value csock_v, value params_v)
 #endif
     }
     else {
-        unsigned int len;
-        void *base = pdf_lookup_substitute_font (state.ctx, 0, 0, 0, 0, &len);
-
-        state.face = load_builtin_font (base, len);
+        int len;
+        const char *data = pdf_lookup_substitute_font (state.ctx, 0, 0,
+                                                       0, 0, &len);
+        state.face = load_builtin_font (data, len);
     }
     if (!state.face) _exit (1);
 
-- 
2.11.4.GIT