Sync with upstream

This commit is contained in:
malc 2016-01-06 22:13:00 +03:00
parent a5daa22f4d
commit fa270a2a5c
3 changed files with 6 additions and 10 deletions

View file

@ -1,7 +1,7 @@
Prerequisites for building from sources:
mupdf [http://mupdf.com/]
git://git.ghostscript.com/mupdf.git
commit 7d60c7e05cb6cead6d91d938dfbb42a1e04438ee
commit 990c79c8e5288a3315a73d8c55084a594f82ccac
ocaml (4.02+) [http://ocaml.org/]
gcc [https://gcc.gnu.org/]
binutils [http://www.gnu.org/software/binutils/]

View file

@ -48,8 +48,7 @@ cflagstbl =
,"-I " ++ mudir ++ "/include -I "
++ mudir ++ "/thirdparty/freetype/include -Wextra")
]
cclib = "-lGL -lX11 -lmupdf -lz -lfreetype -ljpeg\
\ -ljbig2dec -lopenjpeg -lmujs\
cclib = "-lGL -lX11 -lmupdf -lmupdfthird\
\ -lpthread -L" ++ mudir ++ "/build/native -lcrypto"
++ (if egl then " -lEGL" else "")

11
link.c
View file

@ -2276,7 +2276,7 @@ static void ensureannots (struct page *page)
for (annot = fz_first_annot (state.ctx, page->fzpage);
annot;
annot = fz_next_annot (state.ctx, page->fzpage, annot)) {
annot = fz_next_annot (state.ctx, annot)) {
count++;
}
@ -2289,10 +2289,10 @@ static void ensureannots (struct page *page)
for (annot = fz_first_annot (state.ctx, page->fzpage), i = 0;
annot;
annot = fz_next_annot (state.ctx, page->fzpage, annot), i++) {
annot = fz_next_annot (state.ctx, annot), i++) {
fz_rect rect;
fz_bound_annot (state.ctx, page->fzpage, annot, &rect);
fz_bound_annot (state.ctx, annot, &rect);
page->annots[i].annot = annot;
fz_round_rect (&page->annots[i].bbox, &rect);
}
@ -2349,10 +2349,7 @@ static void ensureslinks (struct page *page)
}
for (j = 0; j < page->annotcount; ++j, ++i) {
fz_rect rect;
fz_bound_annot (state.ctx,
page->fzpage,
page->annots[j].annot,
&rect);
fz_bound_annot (state.ctx, page->annots[j].annot, &rect);
fz_transform_rect (&rect, &ctm);
fz_round_rect (&page->slinks[i].bbox, &rect);