diff options
| author | Tor Andersson <tor.andersson@artifex.com> | 2018-06-25 13:15:50 +0200 |
|---|---|---|
| committer | Tor Andersson <tor.andersson@artifex.com> | 2018-07-05 15:32:34 +0200 |
| commit | 4a99615a609eec2b84bb2341d74fac46a5998137 (patch) | |
| tree | 486eacff07448e4c655df1fa1bcb20df709dd8df /include/mupdf/fitz/font.h | |
| parent | 2aa62902447760764e7a763dea322145d9c4808c (diff) | |
| download | mupdf-4a99615a609eec2b84bb2341d74fac46a5998137.tar.xz | |
Pass rect and matrix by value in geometry functions.
Several things irk me about passing values as const pointers:
* They can be NULL, which is not a valid value.
* They require explicit temporary variables for storage.
* They don't compose easily in a legible manner, requiring
weird pointer passing semantics where the variable being assigned
is hidden as an argument in the innermost function call.
* We can't change the value through the pointer, requiring yet more
local variables to hold copies of the input value.
In the device interface where we pass a matrix to a function, we often
find ourselves making a local copy of the matrix so we can concatenate
other transforms to it. This copying is a lot of unnecessary busywork
that I hope to eventually avoid by laying the groundwork with this
commit.
This is a rather large API change, so I apologize for the inconvenience,
but I hope the end result and gain in legibility will be worth the pain.
Diffstat (limited to 'include/mupdf/fitz/font.h')
| -rw-r--r-- | include/mupdf/fitz/font.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/mupdf/fitz/font.h b/include/mupdf/fitz/font.h index aa6d4dd5..13c2bf65 100644 --- a/include/mupdf/fitz/font.h +++ b/include/mupdf/fitz/font.h @@ -372,7 +372,7 @@ fz_font *fz_load_fallback_font(fz_context *ctx, int script, int language, int se Returns a new font handle, or throws exception on allocation failure. */ -fz_font *fz_new_type3_font(fz_context *ctx, const char *name, const fz_matrix *matrix); +fz_font *fz_new_type3_font(fz_context *ctx, const char *name, fz_matrix matrix); /* fz_new_font_from_memory: Create a new font from a font @@ -468,7 +468,7 @@ void fz_set_font_bbox(fz_context *ctx, fz_font *font, float xmin, float ymin, fl Returns r, after filling it in with the bounds of the given glyph. */ -fz_rect *fz_bound_glyph(fz_context *ctx, fz_font *font, int gid, const fz_matrix *trm, fz_rect *r); +fz_rect fz_bound_glyph(fz_context *ctx, fz_font *font, int gid, fz_matrix trm); /* fz_glyph_cacheable: Determine if a given glyph in a font |