diff options
| author | Matt Holgate <matt@emobix.co.uk> | 2014-06-26 18:59:58 +0100 |
|---|---|---|
| committer | Matt Holgate <matt@emobix.co.uk> | 2014-06-26 18:59:58 +0100 |
| commit | a51341c3e2ec46cb4759ca921c4fe011dc3d9dba (patch) | |
| tree | 4ac7ce6a1267a5e4ebd31bd749841b95a8c811f6 /source | |
| parent | c28e36bcc82da76274e07a2906dd994e24980180 (diff) | |
| download | mupdf-a51341c3e2ec46cb4759ca921c4fe011dc3d9dba.tar.xz | |
Partially revert "Add missing fz_var() and fix potential memory leak."
(Revert the fix for potential memory leak - there wasn't a potential memory
leak as the device only takes ownership of it's display list if
dev->free_user is set).
This reverts commit ada560eb015e7b2208c492d47f28da8093733c4a.
Diffstat (limited to 'source')
| -rw-r--r-- | source/fitz/list-device.c | 60 |
1 files changed, 23 insertions, 37 deletions
diff --git a/source/fitz/list-device.c b/source/fitz/list-device.c index 981d530f..529e0bbf 100644 --- a/source/fitz/list-device.c +++ b/source/fitz/list-device.c @@ -557,50 +557,36 @@ fz_list_end_tile(fz_device *dev) fz_device * fz_new_list_device(fz_context *ctx, fz_display_list *list) { - fz_device *dev = NULL; + fz_device *dev = fz_new_device(ctx, list); - fz_var(list); - fz_var(dev); - fz_try(ctx) - { - dev = fz_new_device(ctx, list); - list = NULL; + dev->begin_page = fz_list_begin_page; + dev->end_page = fz_list_end_page; - dev->begin_page = fz_list_begin_page; - dev->end_page = fz_list_end_page; + dev->fill_path = fz_list_fill_path; + dev->stroke_path = fz_list_stroke_path; + dev->clip_path = fz_list_clip_path; + dev->clip_stroke_path = fz_list_clip_stroke_path; - dev->fill_path = fz_list_fill_path; - dev->stroke_path = fz_list_stroke_path; - dev->clip_path = fz_list_clip_path; - dev->clip_stroke_path = fz_list_clip_stroke_path; + dev->fill_text = fz_list_fill_text; + dev->stroke_text = fz_list_stroke_text; + dev->clip_text = fz_list_clip_text; + dev->clip_stroke_text = fz_list_clip_stroke_text; + dev->ignore_text = fz_list_ignore_text; - dev->fill_text = fz_list_fill_text; - dev->stroke_text = fz_list_stroke_text; - dev->clip_text = fz_list_clip_text; - dev->clip_stroke_text = fz_list_clip_stroke_text; - dev->ignore_text = fz_list_ignore_text; + dev->fill_shade = fz_list_fill_shade; + dev->fill_image = fz_list_fill_image; + dev->fill_image_mask = fz_list_fill_image_mask; + dev->clip_image_mask = fz_list_clip_image_mask; - dev->fill_shade = fz_list_fill_shade; - dev->fill_image = fz_list_fill_image; - dev->fill_image_mask = fz_list_fill_image_mask; - dev->clip_image_mask = fz_list_clip_image_mask; + dev->pop_clip = fz_list_pop_clip; - dev->pop_clip = fz_list_pop_clip; + dev->begin_mask = fz_list_begin_mask; + dev->end_mask = fz_list_end_mask; + dev->begin_group = fz_list_begin_group; + dev->end_group = fz_list_end_group; - dev->begin_mask = fz_list_begin_mask; - dev->end_mask = fz_list_end_mask; - dev->begin_group = fz_list_begin_group; - dev->end_group = fz_list_end_group; - - dev->begin_tile = fz_list_begin_tile; - dev->end_tile = fz_list_end_tile; - } - fz_catch(ctx) - { - fz_free_device(dev); - fz_drop_display_list(ctx, list); - fz_rethrow(ctx); - } + dev->begin_tile = fz_list_begin_tile; + dev->end_tile = fz_list_end_tile; return dev; } |