summaryrefslogtreecommitdiff
path: root/platform/gl/gl-font.c
diff options
context:
space:
mode:
authorTor Andersson <tor.andersson@artifex.com>2018-06-25 13:15:50 +0200
committerTor Andersson <tor.andersson@artifex.com>2018-07-05 15:32:34 +0200
commit4a99615a609eec2b84bb2341d74fac46a5998137 (patch)
tree486eacff07448e4c655df1fa1bcb20df709dd8df /platform/gl/gl-font.c
parent2aa62902447760764e7a763dea322145d9c4808c (diff)
downloadmupdf-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-font.c')
-rw-r--r--platform/gl/gl-font.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/platform/gl/gl-font.c b/platform/gl/gl-font.c
index 08dd773a..8a331b3e 100644
--- a/platform/gl/gl-font.c
+++ b/platform/gl/gl-font.c
@@ -137,7 +137,7 @@ static struct glyph *lookup_glyph(fz_font *font, int gid, float *xp, float *yp)
int w, h;
/* match fitz's glyph cache quantization */
- fz_scale(&trm, g_font_size, -g_font_size);
+ trm = fz_scale(g_font_size, -g_font_size);
trm.e = *xp;
trm.f = *yp;
fz_subpixel_adjust(ctx, &trm, &subpix_trm, &subx, &suby);