From b06cd519d76d7b1e85310d6819d0d8200f84a52c Mon Sep 17 00:00:00 2001
From: malc <av1474@comtv.ru>
Date: Sat, 4 Feb 2012 00:00:16 +0400
Subject: [PATCH] Sync with upstream

---
 BUILDING    |  4 ++--
 buildall.sh |  2 +-
 link.c      | 10 +++++-----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/BUILDING b/BUILDING
index 4de2887..10d421c 100644
--- a/BUILDING
+++ b/BUILDING
@@ -6,7 +6,7 @@ be found here[3], dependencies here[4]
 Note that MuPDF is a moving target therefore bellow is the commit id
 of the git version of MuPDF that this version of llpp is known to work
 with: 
-3e65ed4eb3a8aa8cd6375a7029ac3b61a35a1157
+e1016a6c646b3b92f23bea1f0aa959f0ae0b3359
 
 llpp also depends on OCaml[5], lablGL[6] and GLUT[7], having a C
 compiler wouldn't hurt either.
@@ -38,7 +38,7 @@ $ ./llpp -p password /path/to/some.password.protected.pdf
 [6] http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/lablgl.html
 [7] http://www.opengl.org/resources/libraries/glut/
     http://freeglut.sourceforge.net/
-[8] mupdf-3e65ed4eb3a8aa8cd6375a7029ac3b61a35a1157.tgz (4062576 bytes)
+[8] mupdf-e1016a6c646b3b92f23bea1f0aa959f0ae0b3359.tgz (4064527 bytes)
     mupdf-thirdparty.zip (7288384 bytes)
     lablgl-1.04.tar.gz (410525 bytes)
 
diff --git a/buildall.sh b/buildall.sh
index 1af6b9c..ef7621e 100644
--- a/buildall.sh
+++ b/buildall.sh
@@ -8,7 +8,7 @@ root=$(pwd)
 lablgl=http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/dist/lablgl-1.04.tar.gz
 mupdf=git://git.ghostscript.com/mupdf.git
 mupdf3p=http://mupdf.com/download/mupdf-thirdparty-2012-01-27.zip
-mupdfrev=3e65ed4eb3a8aa8cd6375a7029ac3b61a35a1157
+mupdfrev=e1016a6c646b3b92f23bea1f0aa959f0ae0b3359
 
 test -d lablGL-1.04 || (wget -nc $lablgl && tar -xzf lablgl-1.04.tar.gz)
 if ! test -d mupdf; then
diff --git a/link.c b/link.c
index 6f07555..d429ea2 100644
--- a/link.c
+++ b/link.c
@@ -552,7 +552,7 @@ static void freepage (struct page *page)
         fz_free_text_span (state.ctx, page->text);
     }
     if (page->type == DPDF) {
-        pdf_free_page (state.ctx, page->u.pdfpage);
+        pdf_free_page (state.u.pdf, page->u.pdfpage);
     }
     else {
         xps_free_page (state.u.xps, page->u.xpspage);
@@ -618,7 +618,7 @@ static void OPTIMIZE (3) clearpixmap (fz_pixmap *pixmap)
         }
         while (i < sizea) *((char *) a1 + i++) = 0xff;
     }
-    else fz_clear_pixmap_with_color (pixmap, 0xff);
+    else fz_clear_pixmap_with_color (state.ctx, pixmap, 0xff);
 }
 #else
 #define clearpixmap(p) fz_clear_pixmap_with_color (p, 0xff)
@@ -824,7 +824,7 @@ static void initpdims (void)
                 }
 
                 rotate = page->rotate;
-                pdf_free_page (state.ctx, page);
+                pdf_free_page (state.u.pdf, page);
 
                 printd (state.sock, "progress %f Trimming %d",
                         (double) (pageno + 1) / state.pagecount,
@@ -1156,7 +1156,7 @@ static void search (regex_t *re, int pageno, int y, int forward)
                             (int) size, errbuf);
                     fz_free_text_span (state.ctx, text);
                     if (state.type == DPDF) {
-                        pdf_free_page (state.ctx, u.pdfpage);
+                        pdf_free_page (state.u.pdf, u.pdfpage);
                     }
                     else {
                         xps_free_page (state.u.xps, u.xpspage);
@@ -1230,7 +1230,7 @@ static void search (regex_t *re, int pageno, int y, int forward)
         }
         fz_free_text_span (state.ctx, text);
         if (state.type == DPDF) {
-            pdf_free_page (state.ctx, u.pdfpage);
+            pdf_free_page (state.u.pdf, u.pdfpage);
         }
         else {
             xps_free_page (state.u.xps, u.xpspage);
-- 
2.11.4.GIT