summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Andersson <tor.andersson@artifex.com>2012-01-12 00:41:47 +0100
committerTor Andersson <tor.andersson@artifex.com>2012-01-12 00:41:47 +0100
commit09086b236af6e49f2f090f80a450b1d82f217f30 (patch)
tree3dabdec4d3249e0577459c5b5e7a6c2376f381c0
parented625b85feb08e0aa60e27494e72f7487e9b05a5 (diff)
downloadmupdf-09086b236af6e49f2f090f80a450b1d82f217f30.tar.xz
Fix android for previous glyph cache changes.
-rw-r--r--android/jni/mupdf.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/android/jni/mupdf.c b/android/jni/mupdf.c
index ee6a9cc5..277bb7b3 100644
--- a/android/jni/mupdf.c
+++ b/android/jni/mupdf.c
@@ -22,7 +22,6 @@
/* Globals */
fz_colorspace *colorspace;
-fz_glyph_cache *glyphcache;
pdf_xref *xref;
int pagenum = 1;
int resolution = 160;
@@ -60,10 +59,8 @@ Java_com_artifex_mupdf_MuPDFCore_openFile(JNIEnv * env, jobject thiz, jstring jf
}
xref = NULL;
- glyphcache = NULL;
fz_try(ctx)
{
- glyphcache = fz_new_glyph_cache(ctx);
colorspace = fz_device_rgb;
LOGE("Opening document...");
@@ -93,8 +90,6 @@ Java_com_artifex_mupdf_MuPDFCore_openFile(JNIEnv * env, jobject thiz, jstring jf
LOGE("Failed: %s", ctx->error->message);
pdf_free_xref(xref);
xref = NULL;
- fz_free_glyph_cache(ctx, glyphcache);
- glyphcache = NULL;
fz_free_context(ctx);
ctx = NULL;
}
@@ -231,7 +226,7 @@ Java_com_artifex_mupdf_MuPDFCore_drawPage(JNIEnv *env, jobject thiz, jobject bit
yscale = (float)pageH/(float)(bbox.y1-bbox.y0);
ctm = fz_concat(ctm, fz_scale(xscale, yscale));
bbox = fz_round_rect(fz_transform_rect(ctm,currentMediabox));
- dev = fz_new_draw_device(ctx, glyphcache, pix);
+ dev = fz_new_draw_device(ctx, pix);
#ifdef TIME_DISPLAY_LIST
{
clock_t time;
@@ -271,6 +266,4 @@ Java_com_artifex_mupdf_MuPDFCore_destroying(JNIEnv * env, jobject thiz)
currentPageList = NULL;
pdf_free_xref(xref);
xref = NULL;
- fz_free_glyph_cache(ctx, glyphcache);
- glyphcache = NULL;
}