diff options
| author | Robin Watts <robin.watts@artifex.com> | 2012-01-18 15:49:09 +0000 |
|---|---|---|
| committer | Robin Watts <robin.watts@artifex.com> | 2012-01-19 12:40:24 +0000 |
| commit | 40f4ed22806b88ba0e26c458915d4695f1f7c201 (patch) | |
| tree | bacdebee1932d294f8233a8fb14cb86383e5f107 /draw | |
| parent | 2c836b57d5295b47655988cf8deaffda731e1c3c (diff) | |
| download | mupdf-40f4ed22806b88ba0e26c458915d4695f1f7c201.tar.xz | |
Multi-threading support for MuPDF
When we moved over to a context based system, we laid the foundation
for a thread-safe mupdf. This commit should complete that process.
Firstly, fz_clone_context is properly implemented so that it
makes a new context, but shares certain sections (currently
just the allocator, and the store).
Secondly, we add locking (to parts of the code that have
previously just had placeholder LOCK/UNLOCK comments). Functions
to lock and unlock a mutex are added to the allocator structure;
omit these (as is the case today) and no multithreading is
(safely) possible. The context will refuse to clone if these are
not provided.
Finally we flesh out the LOCK/UNLOCK comments to be real calls of
the functions - unfortunately this requires us to plumb fz_context
into the fz_keep_storable function (and all the fz_keep_xxx
functions that call it). This is the largest section of the patch.
No changes expected to any test files.
Diffstat (limited to 'draw')
| -rw-r--r-- | draw/draw_glyph.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/draw/draw_glyph.c b/draw/draw_glyph.c index ebda003e..1edcef4a 100644 --- a/draw/draw_glyph.c +++ b/draw/draw_glyph.c @@ -115,7 +115,7 @@ fz_render_glyph(fz_context *ctx, fz_font *font, int gid, fz_matrix ctm, fz_color val = fz_hash_find(cache->hash, &key); if (val) - return fz_keep_pixmap(val); + return fz_keep_pixmap(ctx, val); ctm.e = floorf(ctm.e) + key.e / 256.0f; ctm.f = floorf(ctm.f) + key.f / 256.0f; @@ -144,7 +144,7 @@ fz_render_glyph(fz_context *ctx, fz_font *font, int gid, fz_matrix ctm, fz_color { fz_hash_insert(cache->hash, &key, val); fz_keep_font(key.font); - val = fz_keep_pixmap(val); + val = fz_keep_pixmap(ctx, val); } fz_catch(ctx) { |