From c22e6a6dc2bf6acbac955bd5fbdd896329dfd725 Mon Sep 17 00:00:00 2001 From: Tor Andersson Date: Mon, 9 Nov 2015 14:17:00 +0100 Subject: Use fz_output instead of FILE* for most of our output needs. Use fz_output in debug printing functions. Use fz_output in pdfshow. Use fz_output in fz_trace_device instead of stdout. Use fz_output in pdf-write.c. Rename fz_new_output_to_filename to fz_new_output_with_path. Add seek and tell to fz_output. Remove unused functions like fz_fprintf. Fix typo in pdf_print_obj. --- source/fitz/output-pwg.c | 34 ++-------------------------------- 1 file changed, 2 insertions(+), 32 deletions(-) (limited to 'source/fitz/output-pwg.c') diff --git a/source/fitz/output-pwg.c b/source/fitz/output-pwg.c index 205966d3..d46dd04f 100644 --- a/source/fitz/output-pwg.c +++ b/source/fitz/output-pwg.c @@ -260,61 +260,31 @@ fz_output_pwg(fz_context *ctx, fz_output *out, const fz_pixmap *pixmap, const fz void fz_write_pwg(fz_context *ctx, fz_pixmap *pixmap, char *filename, int append, const fz_pwg_options *pwg) { - FILE *fp; - fz_output *out = NULL; - - fp = fz_fopen(filename, append ? "ab" : "wb"); - if (!fp) - { - fz_throw(ctx, FZ_ERROR_GENERIC, "cannot open file '%s': %s", filename, strerror(errno)); - } - - fz_var(out); - + fz_output *out = fz_new_output_with_path(ctx, filename, append); fz_try(ctx) { - out = fz_new_output_with_file(ctx, fp, 1); if (!append) fz_output_pwg_file_header(ctx, out); fz_output_pwg_page(ctx, out, pixmap, pwg); } fz_always(ctx) - { fz_drop_output(ctx, out); - } fz_catch(ctx) - { fz_rethrow(ctx); - } } void fz_write_pwg_bitmap(fz_context *ctx, fz_bitmap *bitmap, char *filename, int append, const fz_pwg_options *pwg) { - FILE *fp; - fz_output *out = NULL; - - fp = fz_fopen(filename, append ? "ab" : "wb"); - if (!fp) - { - fz_throw(ctx, FZ_ERROR_GENERIC, "cannot open file '%s': %s", filename, strerror(errno)); - } - - fz_var(out); - + fz_output *out = fz_new_output_with_path(ctx, filename, append); fz_try(ctx) { - out = fz_new_output_with_file(ctx, fp, 1); if (!append) fz_output_pwg_file_header(ctx, out); fz_output_pwg_bitmap_page(ctx, out, bitmap, pwg); } fz_always(ctx) - { fz_drop_output(ctx, out); - } fz_catch(ctx) - { fz_rethrow(ctx); - } } -- cgit v1.2.3