diff options
author | Tor Andersson <tor.andersson@artifex.com> | 2018-10-22 19:39:32 +0200 |
---|---|---|
committer | Tor Andersson <tor.andersson@artifex.com> | 2018-10-23 18:46:01 +0200 |
commit | 2582f7e21ec079d2d611ad748d5fc77ea3ce3938 (patch) | |
tree | 6745a15f6389de3635d17ffb1495b7de1a4aed25 | |
parent | 17e5b245e8f0da3287097684f81d470cec8de991 (diff) | |
download | mupdf-2582f7e21ec079d2d611ad748d5fc77ea3ce3938.tar.xz |
Remove extra blank lines.
34 files changed, 0 insertions, 59 deletions
diff --git a/include/mupdf/fitz/geometry.h b/include/mupdf/fitz/geometry.h index 0eb0f844..f04e8f1c 100644 --- a/include/mupdf/fitz/geometry.h +++ b/include/mupdf/fitz/geometry.h @@ -278,7 +278,6 @@ static inline int fz_is_identity(fz_matrix m) return m.a == 1 && m.b == 0 && m.c == 0 && m.d == 1 && m.e == 0 && m.f == 0; } - /* fz_concat: Multiply two matrices. diff --git a/include/mupdf/fitz/output-tga.h b/include/mupdf/fitz/output-tga.h index 4684a0d5..e481b09e 100644 --- a/include/mupdf/fitz/output-tga.h +++ b/include/mupdf/fitz/output-tga.h @@ -33,5 +33,4 @@ void fz_write_pixmap_as_tga(fz_context *ctx, fz_output *out, fz_pixmap *pixmap); */ fz_band_writer *fz_new_tga_band_writer(fz_context *ctx, fz_output *out, int is_bgr); - #endif diff --git a/include/mupdf/fitz/output.h b/include/mupdf/fitz/output.h index c3fede3e..836a3637 100644 --- a/include/mupdf/fitz/output.h +++ b/include/mupdf/fitz/output.h @@ -70,7 +70,6 @@ typedef void (fz_output_drop_fn)(fz_context *ctx, void *state); */ typedef fz_stream *(fz_stream_from_output_fn)(fz_context *ctx, void *state); - struct fz_output_s { void *state; diff --git a/include/mupdf/pdf/cmap.h b/include/mupdf/pdf/cmap.h index d98cd0ab..107a072b 100644 --- a/include/mupdf/pdf/cmap.h +++ b/include/mupdf/pdf/cmap.h @@ -61,7 +61,6 @@ struct pdf_cmap_s int tlen, tcap, ttop; cmap_splay *tree; - }; pdf_cmap *pdf_new_cmap(fz_context *ctx); diff --git a/platform/gl/gl-ui.c b/platform/gl/gl-ui.c index 9552e562..e4f2bf91 100644 --- a/platform/gl/gl-ui.c +++ b/platform/gl/gl-ui.c @@ -173,7 +173,6 @@ void ui_draw_bevel_imp(fz_irect area, unsigned ot, unsigned it, unsigned ib, uns glRectf(area.x0+1, area.y1-2, area.x1-2, area.y1-1); } - void ui_draw_bevel(fz_irect area, int depressed) { if (depressed) @@ -872,7 +871,6 @@ void ui_splitter(int *x, int min, int max, enum side side) glColorHex(UI_COLOR_BEVEL_1); glRectf(area.x0+3, area.y0, area.x0+4, area.y1); } - } void ui_scrollbar(int x0, int y0, int x1, int y1, int *value, int page_size, int max) diff --git a/platform/java/mupdf_native.c b/platform/java/mupdf_native.c index 459590ba..27095891 100644 --- a/platform/java/mupdf_native.c +++ b/platform/java/mupdf_native.c @@ -1012,7 +1012,6 @@ fz_font *load_droid_fallback_font(fz_context *ctx, int script, int language, int case UCDN_SCRIPT_NUSHU: return load_noto_try(ctx, "Nushu"); case UCDN_SCRIPT_SOYOMBO: return load_noto_try(ctx, "Soyombo"); case UCDN_SCRIPT_ZANABAZAR_SQUARE: return load_noto_try(ctx, "ZanabazarSquare"); - } return NULL; } @@ -3211,7 +3210,6 @@ FUN(NativeDevice_endLayer)(JNIEnv *env, jobject self) jni_rethrow(env, ctx); } - JNIEXPORT void JNICALL FUN(NativeDevice_beginMask)(JNIEnv *env, jobject self, jobject jrect, jboolean luminosity, jobject jcs, jfloatArray jcolor, jint jcp) { diff --git a/platform/x11/pdfapp.c b/platform/x11/pdfapp.c index 72efdcdc..c647a4c0 100644 --- a/platform/x11/pdfapp.c +++ b/platform/x11/pdfapp.c @@ -252,7 +252,6 @@ static int make_fake_doc(pdfapp_t *app) pdf = pdf_create_document(ctx); - contents = fz_new_buffer(ctx, 100); fz_append_printf(ctx, contents, "1 0 0 RG %g w 0 0 m %g %g l 0 %g m %g 0 l s\n", fz_min(mediabox.x1, mediabox.y1) / 20, diff --git a/source/fitz/colorspace.c b/source/fitz/colorspace.c index 78a975a2..f25c5fa8 100644 --- a/source/fitz/colorspace.c +++ b/source/fitz/colorspace.c @@ -3480,7 +3480,6 @@ fz_drop_color_converter(fz_context *ctx, fz_color_converter *cc) if (link) fz_drop_icclink(ctx, link); cc->link = NULL; - } void diff --git a/source/fitz/draw-affine.c b/source/fitz/draw-affine.c index 8b4690a3..1397166a 100644 --- a/source/fitz/draw-affine.c +++ b/source/fitz/draw-affine.c @@ -1721,7 +1721,6 @@ fz_paint_affine_lerp_spots(int da, int sa, int fa, int fb, int dn, int sn, int a } #endif /* FZ_ENABLE_SPOT_RENDERING */ - #if FZ_PLOTTERS_RGB static void paint_affine_lerp_da_sa_g2rgb(byte * FZ_RESTRICT dp, int da, const byte * FZ_RESTRICT sp, int sw, int sh, int ss, int sa, int u, int v, int fa, int fb, int w, int dn1, int sn1, int alpha, const byte * FZ_RESTRICT color, byte * FZ_RESTRICT hp, byte * FZ_RESTRICT gp, const fz_overprint * FZ_RESTRICT eop) diff --git a/source/fitz/draw-blend.c b/source/fitz/draw-blend.c index 21705a90..17c1fed5 100644 --- a/source/fitz/draw-blend.c +++ b/source/fitz/draw-blend.c @@ -53,7 +53,6 @@ And thus: as required. - Alpha blending on top of compositing: ===================================== @@ -461,7 +460,6 @@ fz_blend_nonseparable_gray(byte * FZ_RESTRICT bp, int bal, const byte * FZ_RESTR } if (bal) bp[n] = ba + sa - saba; - } } sp += n + sal; diff --git a/source/fitz/draw-device.c b/source/fitz/draw-device.c index 4f3abd5b..6d530eba 100644 --- a/source/fitz/draw-device.c +++ b/source/fitz/draw-device.c @@ -536,7 +536,6 @@ resolve_color(fz_context *ctx, fz_overprint *op, const float *color, fz_colorspa colorbv[i] = colorfv[i] * 255; for (; i < n; i++) colorbv[i] = 0; - } colorbv[i] = alpha * 255; @@ -2465,7 +2464,6 @@ fz_draw_end_group(fz_context *ctx, fz_device *devp) { fz_rethrow(ctx); } - } typedef struct diff --git a/source/fitz/draw-edgebuffer.c b/source/fitz/draw-edgebuffer.c index b56f6e25..92f35ea8 100644 --- a/source/fitz/draw-edgebuffer.c +++ b/source/fitz/draw-edgebuffer.c @@ -1435,7 +1435,6 @@ static void mark_line_app(fz_context *ctx, fz_edgebuffer *eb, fixed sx, fixed sy t = sy, sy = ey, ey = t; } do_mark_line_app(ctx, eb, sx, sy, ex, ey, rev); - } static void fz_insert_edgebuffer_app(fz_context *ctx, fz_rasterizer *ras, float fsx, float fsy, float fex, float fey, int rev) diff --git a/source/fitz/draw-imp.h b/source/fitz/draw-imp.h index df783609..e9d93512 100644 --- a/source/fitz/draw-imp.h +++ b/source/fitz/draw-imp.h @@ -54,7 +54,6 @@ static inline int fz_idiv_up(int a, int b) #define fz_rasterizer_aa_bits(ras) 4 #define fz_rasterizer_aa_text_bits(ras) 4 - #elif AA_BITS > 0 #define AA_SCALE(s, x) ((x * 255) >> 2) #define fz_aa_hscale 2 @@ -427,7 +426,6 @@ float fz_rasterizer_graphics_min_line_width(fz_rasterizer *ras); */ void fz_set_rasterizer_graphics_min_line_width(fz_context *ctx, fz_aa_context *aa, float min_line_width); - fz_rasterizer *fz_new_gel(fz_context *ctx); typedef enum diff --git a/source/fitz/draw-path.c b/source/fitz/draw-path.c index d809b7d8..64906b7b 100644 --- a/source/fitz/draw-path.c +++ b/source/fitz/draw-path.c @@ -45,8 +45,6 @@ special case code in the edgebuffer based rasterizer to cope with this. */ - - static void line(fz_context *ctx, fz_rasterizer *rast, fz_matrix ctm, float x0, float y0, float x1, float y1) { @@ -839,7 +837,6 @@ fz_stroke_closepath(fz_context *ctx, sctx *s) fz_gap_rasterizer(ctx, s->rast); } - static void fz_stroke_bezier(fz_context *ctx, struct sctx *s, float xa, float ya, diff --git a/source/fitz/font.c b/source/fitz/font.c index 733d91da..234d4a69 100644 --- a/source/fitz/font.c +++ b/source/fitz/font.c @@ -273,7 +273,6 @@ static void *ft_realloc(FT_Memory memory, long cur_size, long new_size, void *bl return fz_resize_array_no_throw(ctx, block, 1, new_size); } - void fz_new_font_context(fz_context *ctx) { ctx->font = fz_malloc_struct(ctx, fz_font_context); diff --git a/source/fitz/icc34.h b/source/fitz/icc34.h index 3b63abcf..a506eb17 100644 --- a/source/fitz/icc34.h +++ b/source/fitz/icc34.h @@ -134,7 +134,6 @@ authorization from SunSoft Inc. */ #define icAny 1 - /*------------------------------------------------------------------------*/ /* * Use this area to translate platform definitions of long @@ -143,7 +142,6 @@ authorization from SunSoft Inc. * */ - #ifdef PACKAGE_NAME /* June 9, 2003, Adapted for use with configure by Bob Friesenhahn @@ -184,7 +182,6 @@ typedef int32_t icInt64Number[2]; #elif defined(__sgi) #include "sgidefs.h" - /* * Number definitions */ @@ -201,7 +198,6 @@ typedef short icInt16Number; typedef __int32_t icInt32Number; typedef __int32_t icInt64Number[2]; - #elif defined(__GNUC__) || defined(__unix__) || defined(__unix) #include <sys/types.h> @@ -212,7 +208,6 @@ typedef __int32_t icInt64Number[2]; #include <stdint.h> #endif - typedef uint8_t icUInt8Number; typedef uint16_t icUInt16Number; typedef uint32_t icUInt32Number; @@ -228,14 +223,12 @@ typedef u_int32_t icUInt64Number[2]; #endif /* defined(__sun) || defined(__hpux) || defined (__MINGW) || defined(__MINGW32__) || defined(HAVE_STDINT_H) */ - /* Signed numbers */ typedef int8_t icInt8Number; typedef int16_t icInt16Number; typedef int32_t icInt32Number; typedef int32_t icInt64Number[2]; - #else /* default definitions */ /* @@ -254,7 +247,6 @@ typedef short icInt16Number; typedef long icInt32Number; typedef long icInt64Number[2]; - #endif /* default defs */ /* Base types */ @@ -263,7 +255,6 @@ typedef icInt32Number icSignature; typedef icInt32Number icS15Fixed16Number; typedef icUInt32Number icU16Fixed16Number; - /*------------------------------------------------------------------------*/ /* public tags and sizes */ typedef enum { @@ -491,7 +482,6 @@ typedef enum { icMaxEnumIluminant = 0xFFFFFFFFL } icIlluminant; - /*------------------------------------------------------------------------*/ /* * Arrays of numbers diff --git a/source/fitz/list-device.c b/source/fitz/list-device.c index 6d6fcf41..a1ad194a 100644 --- a/source/fitz/list-device.c +++ b/source/fitz/list-device.c @@ -150,7 +150,6 @@ struct fz_list_device_s enum { ISOLATED = 1, KNOCKOUT = 2 }; enum { OPM = 1, OP = 2, BP = 3, RI = 4}; - #define SIZE_IN_NODES(t) \ ((t + sizeof(fz_display_node) - 1) / sizeof(fz_display_node)) diff --git a/source/fitz/load-jpx.c b/source/fitz/load-jpx.c index da9ce087..2a15d185 100644 --- a/source/fitz/load-jpx.c +++ b/source/fitz/load-jpx.c @@ -870,7 +870,6 @@ jpx_read_image(fz_context *ctx, fz_jpxd *state, const unsigned char *data, size_ samples[yy * stride + xx * comps + k] = v; } } - } } } diff --git a/source/fitz/separation.c b/source/fitz/separation.c index e8d143e2..bfaf6d6e 100644 --- a/source/fitz/separation.c +++ b/source/fitz/separation.c @@ -9,7 +9,6 @@ enum FZ_SEPARATION_DISABLED_RENDER = 3 }; - struct fz_separations_s { int refs; diff --git a/source/helpers/pkcs7/pkcs7-check.c b/source/helpers/pkcs7/pkcs7-check.c index 225ec385..dbe36944 100644 --- a/source/helpers/pkcs7/pkcs7-check.c +++ b/source/helpers/pkcs7/pkcs7-check.c @@ -7,7 +7,6 @@ #include "mupdf/helpers/pkcs7-openssl.h" #include <string.h> - static void pdf_format_designated_name(pdf_pkcs7_designated_name *name, char *buf, int buflen) { int i, n; diff --git a/source/helpers/pkcs7/pkcs7-openssl.c b/source/helpers/pkcs7/pkcs7-openssl.c index 58dbf65f..eb7de132 100644 --- a/source/helpers/pkcs7/pkcs7-openssl.c +++ b/source/helpers/pkcs7/pkcs7-openssl.c @@ -268,7 +268,6 @@ static enum pdf_signature_error pk7_verify_sig(PKCS7 *p7, BIO *detached) if (!p7bio) goto exit; - /* We now have to 'read' from p7bio to calculate digests etc. */ while (BIO_read(p7bio, readbuf, sizeof(readbuf)) > 0) ; diff --git a/source/html/epub-doc.c b/source/html/epub-doc.c index 85c84624..cd6131aa 100644 --- a/source/html/epub-doc.c +++ b/source/html/epub-doc.c @@ -478,7 +478,6 @@ epub_parse_header(fz_context *ctx, epub_document *doc) } fz_catch(ctx) fz_rethrow(ctx); - } static fz_outline * diff --git a/source/pdf/pdf-cmap.c b/source/pdf/pdf-cmap.c index 5593f967..f9770933 100644 --- a/source/pdf/pdf-cmap.c +++ b/source/pdf/pdf-cmap.c @@ -94,7 +94,6 @@ pdf_add_codespace(fz_context *ctx, pdf_cmap *cmap, unsigned int low, unsigned in cmap->codespace_len ++; } - struct cmap_splay_s { unsigned int low; unsigned int high; @@ -511,8 +510,6 @@ add_range(fz_context *ctx, pdf_cmap *cmap, unsigned int low, unsigned int high, } } - - tree = cmap->tree; if (cmap->tlen) diff --git a/source/pdf/pdf-colorspace.c b/source/pdf/pdf-colorspace.c index 49f2354b..43dd078f 100644 --- a/source/pdf/pdf-colorspace.c +++ b/source/pdf/pdf-colorspace.c @@ -223,7 +223,6 @@ load_devicen(fz_context *ctx, pdf_obj *array) fz_colorspace_name_colorant(ctx, cs, i, pdf_to_name(ctx, pdf_array_get(ctx, nameobj, i))); else fz_colorspace_name_colorant(ctx, cs, 0, pdf_to_name(ctx, nameobj)); - } fz_always(ctx) fz_drop_colorspace(ctx, base); diff --git a/source/pdf/pdf-op-filter.c b/source/pdf/pdf-op-filter.c index 145dbfe2..a5c83b2b 100644 --- a/source/pdf/pdf-op-filter.c +++ b/source/pdf/pdf-op-filter.c @@ -567,7 +567,6 @@ adjustment(fz_context *ctx, pdf_filter_processor *p, fz_point skip) return skip_dist * 1000; } - static void filter_show_text(fz_context *ctx, pdf_filter_processor *p, pdf_obj *text) { @@ -640,7 +639,6 @@ filter_show_text(fz_context *ctx, pdf_filter_processor *p, pdf_obj *text) skip.y += tadj; p->tos.tm = fz_pre_translate(p->tos.tm, 0, tadj); } - } } if (skip.x != 0 || skip.y != 0) diff --git a/source/pdf/pdf-op-run.c b/source/pdf/pdf-op-run.c index b4c014e7..2b6edea4 100644 --- a/source/pdf/pdf-op-run.c +++ b/source/pdf/pdf-op-run.c @@ -953,7 +953,6 @@ pdf_flush_text(fz_context *ctx, pdf_run_processor *pr) break; } } - } fz_always(ctx) { diff --git a/source/pdf/pdf-signature.c b/source/pdf/pdf-signature.c index cb7a807b..c2ceaad8 100644 --- a/source/pdf/pdf-signature.c +++ b/source/pdf/pdf-signature.c @@ -4,7 +4,6 @@ #include <string.h> - void pdf_write_digest(fz_context *ctx, fz_output *out, pdf_obj *byte_range, int hexdigest_offset, int hexdigest_length, pdf_pkcs7_signer *signer) { fz_stream *stm = NULL; diff --git a/source/pdf/pdf-write.c b/source/pdf/pdf-write.c index dd7201da..9a04082b 100644 --- a/source/pdf/pdf-write.c +++ b/source/pdf/pdf-write.c @@ -1723,7 +1723,6 @@ static void copystream(fz_context *ctx, pdf_document *doc, pdf_write_state *opts { fz_rethrow(ctx); } - } static void expandstream(fz_context *ctx, pdf_document *doc, pdf_write_state *opts, pdf_obj *obj_orig, int num, int gen, int do_deflate) @@ -2928,7 +2927,6 @@ change_identity(fz_context *ctx, pdf_document *doc) fz_memrnd(ctx, rnd, 16); str = pdf_new_string(ctx, (char *)rnd, 16); pdf_array_put_drop(ctx, identity, 1, str); - } static void diff --git a/source/svg/svg-doc.c b/source/svg/svg-doc.c index 112368cb..1e652575 100644 --- a/source/svg/svg-doc.c +++ b/source/svg/svg-doc.c @@ -117,7 +117,6 @@ svg_open_document_with_stream(fz_context *ctx, fz_stream *file) return doc; } - fz_display_list * fz_new_display_list_from_svg(fz_context *ctx, fz_buffer *buf, float *w, float *h) { diff --git a/source/tools/mjsgen.c b/source/tools/mjsgen.c index dc667e10..6f220ba9 100644 --- a/source/tools/mjsgen.c +++ b/source/tools/mjsgen.c @@ -59,7 +59,6 @@ static char lorem[] = "pulvinar at. Proin sed arcu vel odio tempus lobortis sed posuere ipsum. Ut " "feugiat pellentesque tortor nec ornare.\n"; - static void usage(void) { fprintf(stderr, "usage: mjsgen [-p password] input.pdf output.mjs\n"); diff --git a/source/tools/mudraw.c b/source/tools/mudraw.c index 720deeb7..bcae107d 100644 --- a/source/tools/mudraw.c +++ b/source/tools/mudraw.c @@ -439,7 +439,6 @@ file_level_headers(fz_context *ctx) fz_parse_pclm_options(ctx, &opts, "compression=flate"); bander = fz_new_pclm_band_writer(ctx, out, &opts); } - } static void @@ -458,7 +457,6 @@ file_level_trailers(fz_context *ctx) if (output_format == OUT_PCLM) fz_drop_band_writer(ctx, bander); - } static void drawband(fz_context *ctx, fz_page *page, fz_display_list *list, fz_matrix ctm, fz_rect tbounds, fz_cookie *cookie, int band_start, fz_pixmap *pix, fz_bitmap **bit) @@ -2046,7 +2044,6 @@ int mudraw_main(int argc, char **argv) fz_drop_context(ctx); - #ifndef DISABLE_MUTHREADS fin_mudraw_locks(); #endif /* DISABLE_MUTHREADS */ diff --git a/source/tools/pdfextract.c b/source/tools/pdfextract.c index e56abe2b..d7ace87d 100644 --- a/source/tools/pdfextract.c +++ b/source/tools/pdfextract.c @@ -223,19 +223,15 @@ static void extractobject(int num) fz_try(ctx) { ref = pdf_new_indirect(ctx, doc, num, 0); - if (isimage(ref)) saveimage(ref); if (isfontdesc(ref)) savefont(ref); - } fz_always(ctx) pdf_drop_obj(ctx, ref); fz_catch(ctx) - { fz_warn(ctx, "ignoring object %d", num); - } } int pdfextract_main(int argc, char **argv) diff --git a/source/xps/xps-imp.h b/source/xps/xps-imp.h index ce372e21..d5757b69 100644 --- a/source/xps/xps-imp.h +++ b/source/xps/xps-imp.h @@ -83,7 +83,6 @@ void xps_read_page_list(fz_context *ctx, xps_document *doc); void xps_print_page_list(fz_context *ctx, xps_document *doc); void xps_drop_page_list(fz_context *ctx, xps_document *doc); - /* * Images, fonts, and colorspaces. */ diff --git a/source/xps/xps-tile.c b/source/xps/xps-tile.c index 7def81c9..659c6239 100644 --- a/source/xps/xps-tile.c +++ b/source/xps/xps-tile.c @@ -318,7 +318,6 @@ xps_parse_canvas(fz_context *ctx, xps_document *doc, fz_matrix ctm, fz_rect area xps_drop_resource_dictionary(ctx, doc, new_dict); fz_catch(ctx) fz_rethrow(ctx); - } void |