diff options
| author | Robin Watts <robin.watts@artifex.com> | 2016-01-12 17:30:59 +0000 |
|---|---|---|
| committer | Robin Watts <robin.watts@artifex.com> | 2016-01-13 12:32:58 +0000 |
| commit | ad8936bf2bcf54c7042bdec20c49c96657649b34 (patch) | |
| tree | 0d6e309f5747e493632b72b34acef1e53e1ed9d7 /source/fitz/text.c | |
| parent | 881b7ea89588677e709aaa7d3d0ffe4aed63822a (diff) | |
| download | mupdf-ad8936bf2bcf54c7042bdec20c49c96657649b34.tar.xz | |
Add lots of consts.
In general, we should use 'const fz_blah' in device calls whenever
the callee should not alter the fz_blah.
Push this through. This shows up various places where we fz_keep
and fz_drop these const things.
I've updated the fz_keep and fz_drops with appropriate casts
to remove the consts. We may need to do the union dance to avoid
the consts for some compilers, but will only do that if required.
I think this is nicer overall, even allowing for the const<->no const
problems.
Diffstat (limited to 'source/fitz/text.c')
| -rw-r--r-- | source/fitz/text.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/source/fitz/text.c b/source/fitz/text.c index 5490f72e..c9dfda9d 100644 --- a/source/fitz/text.c +++ b/source/fitz/text.c @@ -9,14 +9,18 @@ fz_new_text(fz_context *ctx) } fz_text * -fz_keep_text(fz_context *ctx, fz_text *text) +fz_keep_text(fz_context *ctx, const fz_text *textc) { + fz_text *text = (fz_text *)textc; /* Explicit cast away of const */ + return fz_keep_imp(ctx, text, &text->refs); } void -fz_drop_text(fz_context *ctx, fz_text *text) +fz_drop_text(fz_context *ctx, const fz_text *textc) { + fz_text *text = (fz_text *)textc; /* Explicit cast away of const */ + if (fz_drop_imp(ctx, text, &text->refs)) { fz_text_span *span = text->head; @@ -95,7 +99,7 @@ fz_add_text(fz_context *ctx, fz_text *text, fz_font *font, int wmode, const fz_m } fz_rect * -fz_bound_text(fz_context *ctx, fz_text *text, const fz_stroke_state *stroke, const fz_matrix *ctm, fz_rect *bbox) +fz_bound_text(fz_context *ctx, const fz_text *text, const fz_stroke_state *stroke, const fz_matrix *ctm, fz_rect *bbox) { fz_text_span *span; fz_matrix tm, trm; @@ -140,7 +144,7 @@ fz_bound_text(fz_context *ctx, fz_text *text, const fz_stroke_state *stroke, con } fz_text * -fz_clone_text(fz_context *ctx, fz_text *text) +fz_clone_text(fz_context *ctx, const fz_text *text) { fz_text *new_text; fz_text_span *span; |