diff options
| author | Tor Andersson <tor.andersson@artifex.com> | 2016-04-27 17:00:29 +0200 |
|---|---|---|
| committer | Tor Andersson <tor.andersson@artifex.com> | 2016-04-27 17:01:06 +0200 |
| commit | 29d53a0a460e00b3ec9dda508adbd2964077ab27 (patch) | |
| tree | 1576b7808c03324739e56cdae57cd3a92d57b679 /source/tools | |
| parent | 4d9c36cfe000caeaf3dcc79f4ed004e0595975e4 (diff) | |
| download | mupdf-29d53a0a460e00b3ec9dda508adbd2964077ab27.tar.xz | |
Fix 696649: remove fz_rethrow_message calls.
Diffstat (limited to 'source/tools')
| -rw-r--r-- | source/tools/mjsgen.c | 14 | ||||
| -rw-r--r-- | source/tools/mudraw.c | 16 |
2 files changed, 5 insertions, 25 deletions
diff --git a/source/tools/mjsgen.c b/source/tools/mjsgen.c index d1366062..37f315bc 100644 --- a/source/tools/mjsgen.c +++ b/source/tools/mjsgen.c @@ -95,20 +95,10 @@ static void escape_string(FILE *out, int len, const char *string) static void processpage(fz_context *ctx, fz_document *doc, int pagenum) { - fz_page *page; - int needshot = 0; - - fz_try(ctx) - { - page = fz_load_page(ctx, doc, pagenum - 1); - } - fz_catch(ctx) - { - fz_rethrow_message(ctx, "cannot load page %d in file '%s'", pagenum, filename); - } - + fz_page *page = fz_load_page(ctx, doc, pagenum - 1); pdf_document *inter = pdf_specifics(ctx, doc); pdf_widget *widget = NULL; + int needshot = 0; if (inter) widget = pdf_first_widget(inter, (pdf_page *)page); diff --git a/source/tools/mudraw.c b/source/tools/mudraw.c index 120c166d..9e72b652 100644 --- a/source/tools/mudraw.c +++ b/source/tools/mudraw.c @@ -489,10 +489,7 @@ static void drawpage(fz_context *ctx, fz_document *doc, int pagenum) if (showtime) start = gettime(); - fz_try(ctx) - page = fz_load_page(ctx, doc, pagenum - 1); - fz_catch(ctx) - fz_rethrow_message(ctx, "cannot load page %d in file '%s'", pagenum, filename); + page = fz_load_page(ctx, doc, pagenum - 1); if (showmd5 || showtime || showfeatures) fprintf(stderr, "page %s %d", filename, pagenum); @@ -532,7 +529,7 @@ static void drawpage(fz_context *ctx, fz_document *doc, int pagenum) { fz_drop_display_list(ctx, list); fz_drop_page(ctx, page); - fz_rethrow_message(ctx, "cannot draw page %d in file '%s'", pagenum, filename); + fz_rethrow(ctx); } } @@ -1422,14 +1419,7 @@ int mudraw_main(int argc, char **argv) filename = argv[fz_optind++]; files++; - fz_try(ctx) - { - doc = fz_open_document(ctx, filename); - } - fz_catch(ctx) - { - fz_rethrow_message(ctx, "cannot open document: %s", filename); - } + doc = fz_open_document(ctx, filename); if (fz_needs_password(ctx, doc)) { |