diff options
| author | Tor Andersson <tor.andersson@artifex.com> | 2015-04-14 11:53:53 +0200 |
|---|---|---|
| committer | Robin Watts <robin.watts@artifex.com> | 2015-04-14 16:13:58 +0100 |
| commit | a7be4a1caca767baa0ce0946792f3c3e9e150308 (patch) | |
| tree | 76804ec000992a20fdf62bf962ef06df6750a0e8 /platform | |
| parent | 1bc74dac2b251764d373c164e2b5235875f27901 (diff) | |
| download | mupdf-a7be4a1caca767baa0ce0946792f3c3e9e150308.tar.xz | |
Split fz_meta into separate querying functions.
Add fz_has_permission function to fz_document.
Add fz_lookup_metadata function to fz_document.
Remove fz_meta function from fz_document.
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/android/jni/mupdf.c | 2 | ||||
| -rw-r--r-- | platform/x11/win_main.c | 27 |
2 files changed, 15 insertions, 14 deletions
diff --git a/platform/android/jni/mupdf.c b/platform/android/jni/mupdf.c index 1cb50c54..d351ee6c 100644 --- a/platform/android/jni/mupdf.c +++ b/platform/android/jni/mupdf.c @@ -524,7 +524,7 @@ JNI_FN(MuPDFCore_fileFormatInternal)(JNIEnv * env, jobject thiz) globals *glo = get_globals(env, thiz); fz_context *ctx = glo->ctx; - fz_meta(ctx, glo->doc, FZ_META_FORMAT_INFO, info, sizeof(info)); + fz_lookup_metadata(ctx, glo->doc, FZ_META_FORMAT, info, sizeof(info)); return (*env)->NewStringUTF(env, info); } diff --git a/platform/x11/win_main.c b/platform/x11/win_main.c index df29e022..6b5bbe05 100644 --- a/platform/x11/win_main.c +++ b/platform/x11/win_main.c @@ -452,7 +452,11 @@ dloginfoproc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) SetDlgItemTextW(hwnd, 0x10, wbuf); - if (fz_meta(ctx, doc, FZ_META_FORMAT_INFO, buf, 256) < 0) + if (fz_lookup_metadata(ctx, doc, FZ_META_FORMAT, buf, sizeof buf) >= 0) + { + SetDlgItemTextA(hwnd, 0x11, buf); + } + else { SetDlgItemTextA(hwnd, 0x11, "Unknown"); SetDlgItemTextA(hwnd, 0x12, "None"); @@ -460,9 +464,7 @@ dloginfoproc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) return TRUE; } - SetDlgItemTextA(hwnd, 0x11, buf); - - if (fz_meta(ctx, doc, FZ_META_CRYPT_INFO, buf, 256) == 0) + if (fz_lookup_metadata(ctx, doc, FZ_META_ENCRYPTION, buf, sizeof buf) >= 0) { SetDlgItemTextA(hwnd, 0x12, buf); } @@ -470,26 +472,25 @@ dloginfoproc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { SetDlgItemTextA(hwnd, 0x12, "None"); } + buf[0] = 0; - if (fz_meta(ctx, doc, FZ_META_HAS_PERMISSION, NULL, FZ_PERMISSION_PRINT) == 0) + if (fz_has_permission(ctx, doc, FZ_PERMISSION_PRINT)) strcat(buf, "print, "); - if (fz_meta(ctx, doc, FZ_META_HAS_PERMISSION, NULL, FZ_PERMISSION_CHANGE) == 0) - strcat(buf, "modify, "); - if (fz_meta(ctx, doc, FZ_META_HAS_PERMISSION, NULL, FZ_PERMISSION_COPY) == 0) + if (fz_has_permission(ctx, doc, FZ_PERMISSION_COPY)) strcat(buf, "copy, "); - if (fz_meta(ctx, doc, FZ_META_HAS_PERMISSION, NULL, FZ_PERMISSION_NOTES) == 0) + if (fz_has_permission(ctx, doc, FZ_PERMISSION_EDIT)) + strcat(buf, "edit, "); + if (fz_has_permission(ctx, doc, FZ_PERMISSION_ANNOTATE)) strcat(buf, "annotate, "); if (strlen(buf) > 2) buf[strlen(buf)-2] = 0; else - strcpy(buf, "None"); + strcpy(buf, "none"); SetDlgItemTextA(hwnd, 0x13, buf); #define SETUTF8(ID, STRING) \ + if (fz_lookup_metadata(ctx, doc, "info:" STRING, buf, sizeof buf) >= 0) \ { \ - *(char **)buf = STRING; \ - if (fz_meta(ctx, doc, FZ_META_INFO, buf, 256) <= 0) \ - buf[0] = 0; \ MultiByteToWideChar(CP_UTF8, 0, buf, -1, bufx, nelem(bufx)); \ SetDlgItemTextW(hwnd, ID, bufx); \ } |