diff options
| author | Robin Watts <robin.watts@artifex.com> | 2015-02-25 14:43:11 +0000 |
|---|---|---|
| committer | Robin Watts <robin.watts@artifex.com> | 2015-02-25 14:45:24 +0000 |
| commit | 27f19999ffd723584501ac891c4529eda51a4745 (patch) | |
| tree | 195760183d5dd3adb44f35fe9f47c33ce64deda5 | |
| parent | 4f7fbefa78f6b08fe340f4acb38c617384d88647 (diff) | |
| download | mupdf-27f19999ffd723584501ac891c4529eda51a4745.tar.xz | |
Fix Android builds.
Update android Core.mk file for html document handler, and fix a
stray fz_free_page that didn't get updated.
| -rw-r--r-- | platform/android/jni/Core.mk | 6 | ||||
| -rw-r--r-- | platform/android/jni/mupdf.c | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/platform/android/jni/Core.mk b/platform/android/jni/Core.mk index 7f45e95f..c1eb07dc 100644 --- a/platform/android/jni/Core.mk +++ b/platform/android/jni/Core.mk @@ -51,14 +51,10 @@ LOCAL_SRC_FILES := \ $(wildcard $(MY_ROOT)/source/pdf/*.c) \ $(wildcard $(MY_ROOT)/source/xps/*.c) \ $(wildcard $(MY_ROOT)/source/cbz/*.c) \ - $(wildcard $(MY_ROOT)/source/img/*.c) \ - $(wildcard $(MY_ROOT)/source/tiff/*.c) + $(wildcard $(MY_ROOT)/source/html/*.c) LOCAL_SRC_FILES += \ $(MY_ROOT)/source/pdf/js/pdf-js.c \ $(MY_ROOT)/source/pdf/js/pdf-jsimp-mu.c -ifdef MEMENTO -LOCAL_SRC_FILES += $(MY_ROOT)/source/fitz/memento.c -endif LOCAL_LDLIBS := -lm -llog -ljnigraphics diff --git a/platform/android/jni/mupdf.c b/platform/android/jni/mupdf.c index 5e6506be..98b88373 100644 --- a/platform/android/jni/mupdf.c +++ b/platform/android/jni/mupdf.c @@ -137,7 +137,7 @@ static void drop_page_cache(globals *glo, page_cache *pc) pc->page_list = NULL; fz_drop_display_list(ctx, pc->annot_list); pc->annot_list = NULL; - fz_free_page(ctx, pc->page); + fz_drop_page(ctx, pc->page); pc->page = NULL; drop_changed_rects(ctx, &pc->changed_rects); drop_changed_rects(ctx, &pc->hq_changed_rects); |