diff options
| author | Tor Andersson <tor.andersson@artifex.com> | 2016-11-02 12:19:41 +0100 |
|---|---|---|
| committer | Tor Andersson <tor.andersson@artifex.com> | 2016-11-02 12:24:17 +0100 |
| commit | 3a0cd035010aea567ba07755a76a7a2e94c96aa4 (patch) | |
| tree | a0b0c44e32da859845e3563a232ef4d1ccb458a0 | |
| parent | 076780b0830dad0dad36915f7fc0a3fef272e59f (diff) | |
| download | mupdf-3a0cd035010aea567ba07755a76a7a2e94c96aa4.tar.xz | |
android: Fix spelling error.
3 files changed, 7 insertions, 6 deletions
diff --git a/platform/android/viewer/jni/mupdf.c b/platform/android/viewer/jni/mupdf.c index c8c01866..c50d5a89 100644 --- a/platform/android/viewer/jni/mupdf.c +++ b/platform/android/viewer/jni/mupdf.c @@ -796,6 +796,7 @@ JNI_FN(MuPDFCore_drawPage)(JNIEnv *env, jobject thiz, jobject bitmap, fz_throw(ctx, FZ_ERROR_GENERIC, "Render aborted"); } } + if (pc->annot_list == NULL) { fz_annot *annot; @@ -813,14 +814,14 @@ JNI_FN(MuPDFCore_drawPage)(JNIEnv *env, jobject thiz, jobject bitmap, fz_throw(ctx, FZ_ERROR_GENERIC, "Render aborted"); } } + bbox.x0 = patchX; bbox.y0 = patchY; bbox.x1 = patchX + patchW; bbox.y1 = patchY + patchH; pixbbox = bbox; pixbbox.x1 = pixbbox.x0 + info.width; - /* pixmaps cannot handle right-edge padding, so the bbox must be expanded to - * match the pixels data */ + /* pixmaps cannot handle right-edge padding, so the bbox must be expanded to match the pixels data */ pix = fz_new_pixmap_with_bbox_and_data(ctx, glo->colorspace, &pixbbox, 1, pixels); if (pc->page_list == NULL && pc->annot_list == NULL) { @@ -833,13 +834,13 @@ JNI_FN(MuPDFCore_drawPage)(JNIEnv *env, jobject thiz, jobject bitmap, fz_scale(&ctm, zoom, zoom); rect = pc->media_box; fz_round_rect(&bbox, fz_transform_rect(&rect, &ctm)); - /* Now, adjust ctm so that it would give the correct page width - * heights. */ + /* Now, adjust ctm so that it would give the correct page width heights. */ xscale = (float)pageW/(float)(bbox.x1-bbox.x0); yscale = (float)pageH/(float)(bbox.y1-bbox.y0); fz_concat(&ctm, &ctm, fz_scale(&scale, xscale, yscale)); rect = pc->media_box; fz_transform_rect(&rect, &ctm); + dev = fz_new_draw_device(ctx, NULL, pix); #ifdef TIME_DISPLAY_LIST { diff --git a/platform/android/viewer/src/com/artifex/mupdfdemo/MuPDFCore.java b/platform/android/viewer/src/com/artifex/mupdfdemo/MuPDFCore.java index 80174416..9d5f3818 100644 --- a/platform/android/viewer/src/com/artifex/mupdfdemo/MuPDFCore.java +++ b/platform/android/viewer/src/com/artifex/mupdfdemo/MuPDFCore.java @@ -275,7 +275,7 @@ public class MuPDFCore return getWidgetAreasInternal(page); } - public synchronized Annotation [] getAnnoations(int page) { + public synchronized Annotation [] getAnnotations(int page) { return getAnnotationsInternal(page); } diff --git a/platform/android/viewer/src/com/artifex/mupdfdemo/MuPDFPageView.java b/platform/android/viewer/src/com/artifex/mupdfdemo/MuPDFPageView.java index bca0254f..3f48cc37 100644 --- a/platform/android/viewer/src/com/artifex/mupdfdemo/MuPDFPageView.java +++ b/platform/android/viewer/src/com/artifex/mupdfdemo/MuPDFPageView.java @@ -611,7 +611,7 @@ public class MuPDFPageView extends PageView implements MuPDFView { mLoadAnnotations = new AsyncTask<Void,Void,Annotation[]> () { @Override protected Annotation[] doInBackground(Void... params) { - return mCore.getAnnoations(mPageNumber); + return mCore.getAnnotations(mPageNumber); } @Override |