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 /platform/gl/gl-input.c | |
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 'platform/gl/gl-input.c')
-rw-r--r-- | platform/gl/gl-input.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/platform/gl/gl-input.c b/platform/gl/gl-input.c index 56fcf74d..c3898f50 100644 --- a/platform/gl/gl-input.c +++ b/platform/gl/gl-input.c @@ -409,7 +409,7 @@ int ui_input(struct input *input, int width, int height) area = ui_pack(width, ui.lineheight * height + 6); ui_draw_bevel_rect(area, UI_COLOR_TEXT_BG, 1); - fz_expand_irect(&area, -2); + area = fz_expand_irect(area, -2); if (height > 1) area.x1 -= ui.lineheight; |