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/path.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/path.h')
-rw-r--r-- | include/mupdf/fitz/path.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/mupdf/fitz/path.h b/include/mupdf/fitz/path.h index 47e80841..aac7232d 100644 --- a/include/mupdf/fitz/path.h +++ b/include/mupdf/fitz/path.h @@ -323,7 +323,7 @@ void fz_closepath(fz_context *ctx, fz_path *path); Throws exceptions if the path is packed, or on failure to allocate. */ -void fz_transform_path(fz_context *ctx, fz_path *path, const fz_matrix *transform); +void fz_transform_path(fz_context *ctx, fz_path *path, fz_matrix transform); /* fz_bound_path: Return a bounding rectangle for a path. @@ -341,8 +341,8 @@ void fz_transform_path(fz_context *ctx, fz_path *path, const fz_matrix *transfor Returns r, updated to contain the bounding rectangle. */ -fz_rect *fz_bound_path(fz_context *ctx, const fz_path *path, const fz_stroke_state *stroke, const fz_matrix *ctm, fz_rect *r); -fz_rect *fz_adjust_rect_for_stroke(fz_context *ctx, fz_rect *r, const fz_stroke_state *stroke, const fz_matrix *ctm); +fz_rect fz_bound_path(fz_context *ctx, const fz_path *path, const fz_stroke_state *stroke, fz_matrix ctm); +fz_rect fz_adjust_rect_for_stroke(fz_context *ctx, fz_rect rect, const fz_stroke_state *stroke, fz_matrix ctm); extern const fz_stroke_state fz_default_stroke_state; |