diff options
-rw-r--r-- | apps/jstest_main.c | 1 | ||||
-rw-r--r-- | apps/pdfapp.c | 1 | ||||
-rw-r--r-- | cbz/mucbz.c | 1 | ||||
-rw-r--r-- | doc/multi-threaded.c | 1 | ||||
-rw-r--r-- | draw/draw_simple_scale.c | 4 | ||||
-rw-r--r-- | fitz/fitz-internal.h | 3 | ||||
-rw-r--r-- | fitz/fitz.h | 6 | ||||
-rw-r--r-- | fitz/res_path.c | 1 | ||||
-rw-r--r-- | fitz/stm_comp_buf.c | 1 | ||||
-rw-r--r-- | fitz/stm_output.c | 2 | ||||
-rw-r--r-- | pdf/pdf_device.c | 2 | ||||
-rw-r--r-- | pdf/pdf_form.c | 10 | ||||
-rw-r--r-- | pdf/pdf_interpret.c | 2 | ||||
-rw-r--r-- | pdf/pdf_js.c | 1 | ||||
-rw-r--r-- | pdf/pdf_js_none.c | 2 | ||||
-rw-r--r-- | pdf/pdf_jsimp_cpp.c | 1 | ||||
-rw-r--r-- | pdf/pdf_jsimp_cpp.h | 1 | ||||
-rw-r--r-- | pdf/pdf_store.c | 1 | ||||
-rw-r--r-- | pdf/pdf_type3.c | 1 | ||||
-rw-r--r-- | pdf/pdf_write.c | 3 | ||||
-rw-r--r-- | pdf/pdf_xobject.c | 2 | ||||
-rw-r--r-- | pdf/pdf_xref.c | 1 |
22 files changed, 10 insertions, 38 deletions
diff --git a/apps/jstest_main.c b/apps/jstest_main.c index f3ba0fc5..7ef197b9 100644 --- a/apps/jstest_main.c +++ b/apps/jstest_main.c @@ -290,7 +290,6 @@ static void unescape_string(char *d, const char *s) *d = 0; } - int main(int argc, char *argv[]) { diff --git a/apps/pdfapp.c b/apps/pdfapp.c index d26071b5..40b57e1a 100644 --- a/apps/pdfapp.c +++ b/apps/pdfapp.c @@ -580,7 +580,6 @@ static void pdfapp_updatepage(pdfapp_t *app) fz_free_device(idev); } - pdfapp_showpage(app, 0, 0, 1, 0); } diff --git a/cbz/mucbz.c b/cbz/mucbz.c index 05119938..b06851fe 100644 --- a/cbz/mucbz.c +++ b/cbz/mucbz.c @@ -370,7 +370,6 @@ cbz_image_to_pixmap(fz_context *ctx, fz_image *image_, int x, int w) return fz_keep_pixmap(ctx, image->pix); } - cbz_page * cbz_load_page(cbz_document *doc, int number) { diff --git a/doc/multi-threaded.c b/doc/multi-threaded.c index 70f66660..7d6c34a4 100644 --- a/doc/multi-threaded.c +++ b/doc/multi-threaded.c @@ -68,7 +68,6 @@ struct data { fz_pixmap *pix; }; - // This is the function run by each rendering function. It takes // pointer to an instance of the data structure described above and // renders the display list into the pixmap before exiting. diff --git a/draw/draw_simple_scale.c b/draw/draw_simple_scale.c index 4957b20d..811bae13 100644 --- a/draw/draw_simple_scale.c +++ b/draw/draw_simple_scale.c @@ -1242,7 +1242,7 @@ fz_scale_pixmap_cached(fz_context *ctx, fz_pixmap *src, float x, float y, float return NULL; /* Clamp small ranges of w and h */ - if (w <= -1) + if (w <= -1) { } else if (w < 0) @@ -1253,7 +1253,7 @@ fz_scale_pixmap_cached(fz_context *ctx, fz_pixmap *src, float x, float y, float { w = 1; } - if (h <= -1) + if (h <= -1) { } else if (h < 0) diff --git a/fitz/fitz-internal.h b/fitz/fitz-internal.h index ed18b9d6..75283a49 100644 --- a/fitz/fitz-internal.h +++ b/fitz/fitz-internal.h @@ -95,7 +95,6 @@ extern void __gnu_mcount_nc(void); #endif #endif - /* * Basic runtime and utility functions */ @@ -1460,8 +1459,6 @@ void fz_end_tile(fz_device *dev); fz_device *fz_new_device(fz_context *ctx, void *user); - - /* * Plotting functions. */ diff --git a/fitz/fitz.h b/fitz/fitz.h index a0f29dd9..8e3bcfae 100644 --- a/fitz/fitz.h +++ b/fitz/fitz.h @@ -236,7 +236,6 @@ struct fz_error_context_s void fz_var_imp(void *); #define fz_var(var) fz_var_imp((void *)&(var)) - /* Exception macro definitions. Just treat these as a black box - pay no attention to the man behind the curtain. @@ -266,7 +265,6 @@ void fz_rethrow(fz_context *); void fz_warn(fz_context *ctx, const char *fmt, ...) __printflike(2, 3); const char *fz_caught(fz_context *ctx); - /* fz_flush_warnings: Flush any repeated warnings. @@ -854,7 +852,6 @@ struct fz_matrix_s float a, b, c, d, e, f; }; - /* fz_identity: Identity transform matrix. */ @@ -2908,7 +2905,6 @@ int fz_choice_widget_value(fz_interactive *idoc, fz_widget *tw, char *opts[]); */ void fz_choice_widget_set_value(fz_interactive *idoc, fz_widget *tw, int n, char *opts[]); - /* Document events: the objects via which MuPDF informs the calling app of occurrences emanating from the document, possibly from user interaction @@ -3099,7 +3095,7 @@ struct fz_write_options_s int do_linear; /* If non-zero then write linearised. */ int continue_on_error; /* If non-zero, errors are (optionally) counted and writing continues. */ - int *errors; /* Pointer to a place to store a count of errors */ + int *errors; /* Pointer to a place to store a count of errors */ }; /* An enumeration of bitflags to use in the above 'do_expand' field of diff --git a/fitz/res_path.c b/fitz/res_path.c index 8bb5d778..f8d1e8ce 100644 --- a/fitz/res_path.c +++ b/fitz/res_path.c @@ -469,7 +469,6 @@ fz_new_stroke_state(fz_context *ctx) return fz_new_stroke_state_with_len(ctx, 0); } - fz_stroke_state * fz_unshare_stroke_state_with_len(fz_context *ctx, fz_stroke_state *shared, int len) { diff --git a/fitz/stm_comp_buf.c b/fitz/stm_comp_buf.c index a8ed3f4f..e6a167b5 100644 --- a/fitz/stm_comp_buf.c +++ b/fitz/stm_comp_buf.c @@ -13,7 +13,6 @@ fz_free_compressed_buffer(fz_context *ctx, fz_compressed_buffer *buf) fz_free(ctx, buf); } - fz_stream * fz_open_image_decomp_stream(fz_context *ctx, fz_compressed_buffer *buffer, int *l2factor) { diff --git a/fitz/stm_output.c b/fitz/stm_output.c index de3d185e..f438a5b1 100644 --- a/fitz/stm_output.c +++ b/fitz/stm_output.c @@ -62,4 +62,4 @@ fz_new_output_buffer(fz_context *ctx, fz_buffer *buf) out->printf = buffer_printf; out->close = NULL; return out; -}
\ No newline at end of file +} diff --git a/pdf/pdf_device.c b/pdf/pdf_device.c index aea5593f..36a0e89c 100644 --- a/pdf/pdf_device.c +++ b/pdf/pdf_device.c @@ -282,7 +282,6 @@ send_image(pdf_device *pdev, fz_image *image, int mask, int smask) if (bpc) pdf_dict_puts_drop(imobj, "BitsPerComponent", pdf_new_int(ctx, bpc)); - imref = pdf_new_ref(pdev->xref, imobj); pdf_update_stream(pdev->xref, pdf_to_num(imref), buffer); pdf_dict_puts_drop(imobj, "Length", pdf_new_int(ctx, buffer->len)); @@ -598,7 +597,6 @@ pdf_dev_tm(pdf_device *pdev, const fz_matrix *tm) gs->tm = *tm; } - static void pdf_dev_push_new_buf(pdf_device *pdev, fz_buffer *buf, void (*on_pop)(pdf_device*,void *), void *on_pop_arg) { diff --git a/pdf/pdf_form.c b/pdf/pdf_form.c index bdab08e7..c57608c0 100644 --- a/pdf/pdf_form.c +++ b/pdf/pdf_form.c @@ -51,7 +51,6 @@ enum Display_NoView }; - enum { Q_Left = 0, @@ -1057,8 +1056,7 @@ static int get_matrix(pdf_document *doc, pdf_xobject *form, int q, fz_matrix *mt coef_i = MATRIX_COEFS-1; } - coefs[coef_i++] = tok == PDF_TOK_INT ? lbuf.i - : lbuf.f; + coefs[coef_i++] = tok == PDF_TOK_INT ? lbuf.i : lbuf.f; } else { @@ -1647,7 +1645,7 @@ static pdf_obj *specified_fields(pdf_document *doc, pdf_obj *fields, int exclude pdf_obj *form = pdf_dict_getp(doc->trailer, "Root/AcroForm/Fields"); int i, n; pdf_obj *result = pdf_new_array(ctx, 0); - pdf_obj *nil = NULL; + pdf_obj *nil = NULL; fz_var(nil); fz_try(ctx) @@ -2539,7 +2537,7 @@ void pdf_field_set_fill_color(pdf_document *doc, pdf_obj *field, pdf_obj *col) { /* col == NULL mean transparent, but we can simply pass it on as with * non-NULL values because pdf_dict_putp interprets a NULL value as - " delete */ + * delete */ pdf_dict_putp(field, "MK/BG", col); pdf_field_mark_dirty(doc->ctx, field); } @@ -2595,7 +2593,7 @@ fz_rect *fz_bound_widget(fz_widget *widget, fz_rect *rect) if (rect == NULL) return NULL; - *rect = annot->pagerect; + *rect = annot->pagerect; return rect; } diff --git a/pdf/pdf_interpret.c b/pdf/pdf_interpret.c index 3021196c..d5bf4cd2 100644 --- a/pdf/pdf_interpret.c +++ b/pdf/pdf_interpret.c @@ -984,7 +984,6 @@ copy_state(fz_context *ctx, pdf_gstate *gs, pdf_gstate *old) pdf_keep_xobject(ctx, gs->softmask); } - static pdf_csi * pdf_new_csi(pdf_document *xref, fz_device *dev, const fz_matrix *ctm, char *event, fz_cookie *cookie, pdf_gstate *gstate, int nested) { @@ -1421,7 +1420,6 @@ pdf_run_xobject(pdf_csi *csi, pdf_obj *resources, pdf_xobject *xobj, const fz_ma { pdf_xobject *softmask = gstate->softmask; - gstate->softmask = NULL; popmask = 1; diff --git a/pdf/pdf_js.c b/pdf/pdf_js.c index 6f3db814..0060061f 100644 --- a/pdf/pdf_js.c +++ b/pdf/pdf_js.c @@ -147,7 +147,6 @@ static pdf_obj *load_color(fz_context *ctx, pdf_jsimp *imp, pdf_jsimp_obj *val) int i; int n; - n = pdf_jsimp_array_len(imp, val); /* The only legitimate color expressed as an array of length 1 diff --git a/pdf/pdf_js_none.c b/pdf/pdf_js_none.c index 5a57d6ca..8d129609 100644 --- a/pdf/pdf_js_none.c +++ b/pdf/pdf_js_none.c @@ -60,4 +60,4 @@ void pdf_js_execute_count(pdf_js *js, char *code, int count) int pdf_js_supported() { return 0; -}
\ No newline at end of file +} diff --git a/pdf/pdf_jsimp_cpp.c b/pdf/pdf_jsimp_cpp.c index d47ffc8d..c521f239 100644 --- a/pdf/pdf_jsimp_cpp.c +++ b/pdf/pdf_jsimp_cpp.c @@ -6,7 +6,6 @@ #include "mupdf-internal.h" #include "pdf_jsimp_cpp.h" - pdf_jsimp *pdf_new_jsimp(fz_context *ctx, void *jsctx) { pdf_jsimp *jsi = NULL; diff --git a/pdf/pdf_jsimp_cpp.h b/pdf/pdf_jsimp_cpp.h index a35e9733..83af1d23 100644 --- a/pdf/pdf_jsimp_cpp.h +++ b/pdf/pdf_jsimp_cpp.h @@ -1,7 +1,6 @@ /* C++ version of the pdf_jsimp api. C++ cannot safely call fz_throw, * so C++ implementations return explicit errors in char * form. */ - fz_context *pdf_jsimp_ctx_cpp(pdf_jsimp *imp); const char *pdf_new_jsimp_cpp(fz_context *ctx, void *jsctx, pdf_jsimp **imp); const char *pdf_drop_jsimp_cpp(pdf_jsimp *imp); diff --git a/pdf/pdf_store.c b/pdf/pdf_store.c index 2b20fca1..530229d3 100644 --- a/pdf/pdf_store.c +++ b/pdf/pdf_store.c @@ -75,4 +75,3 @@ pdf_remove_item(fz_context *ctx, fz_store_free_fn *free, pdf_obj *key) { fz_remove_item(ctx, free, key, &pdf_obj_store_type); } - diff --git a/pdf/pdf_type3.c b/pdf/pdf_type3.c index 8dd780dd..047f9ef1 100644 --- a/pdf/pdf_type3.c +++ b/pdf/pdf_type3.c @@ -14,7 +14,6 @@ pdf_t3_free_resources(void *doc, void *rdb_) pdf_drop_obj(rdb); } - pdf_font_desc * pdf_load_type3_font(pdf_document *xref, pdf_obj *rdb, pdf_obj *dict) { diff --git a/pdf/pdf_write.c b/pdf/pdf_write.c index 8823c100..2c0ca0b4 100644 --- a/pdf/pdf_write.c +++ b/pdf/pdf_write.c @@ -5,7 +5,6 @@ /* #define DEBUG_HEAP_SORT */ /* #define DEBUG_WRITING */ - typedef struct pdf_write_options_s pdf_write_options; /* @@ -1394,7 +1393,6 @@ update_linearization_params(pdf_document *xref, pdf_write_options *opts) pdf_set_int(opts->hints_length, opts->hintstream_len); } - /* * Make sure we have loaded objects from object streams. */ @@ -2191,7 +2189,6 @@ static void dump_object_details(pdf_document *xref, pdf_write_options *opts) } #endif - void pdf_write_document(pdf_document *xref, char *filename, fz_write_options *fz_opts) { int lastfree; diff --git a/pdf/pdf_xobject.c b/pdf/pdf_xobject.c index a334392f..525c04ae 100644 --- a/pdf/pdf_xobject.c +++ b/pdf/pdf_xobject.c @@ -79,7 +79,7 @@ pdf_load_xobject(pdf_document *xref, pdf_obj *dict) form->isolated = pdf_to_bool(pdf_dict_gets(attrs, "I")); form->knockout = pdf_to_bool(pdf_dict_gets(attrs, "K")); - + obj = pdf_dict_gets(attrs, "S"); if (pdf_is_name(obj) && !strcmp(pdf_to_name(obj), "Transparency")) form->transparency = 1; diff --git a/pdf/pdf_xref.c b/pdf/pdf_xref.c index 0e954c30..c94ad85e 100644 --- a/pdf/pdf_xref.c +++ b/pdf/pdf_xref.c @@ -1321,7 +1321,6 @@ pdf_page_presentation(pdf_document *doc, pdf_page *page, float *duration) return &page->transition; } - static fz_interactive * pdf_interact(pdf_document *doc) { |