diff options
author | Robin Watts <robin.watts@artifex.com> | 2011-11-14 18:22:13 +0000 |
---|---|---|
committer | Robin Watts <robin.watts@artifex.com> | 2011-11-15 15:20:54 +0000 |
commit | 9c0a49060475b2dea1e4c2668bebd1d566113a7b (patch) | |
tree | 49e45a691cf105f4266d5c6b7242a4a3256c1200 /pdf/mupdf.h | |
parent | 60c0544742931da63db623ad7a79ba3758704cc1 (diff) | |
parent | fd6def85f22b598d4c278e76138ab7dccbb84c36 (diff) | |
download | mupdf-9c0a49060475b2dea1e4c2668bebd1d566113a7b.tar.xz |
Merge branch 'master' into context
Mostly redoing the xps_context to xps_document change and adding
contexts to newly written code.
Conflicts:
apps/pdfapp.c
apps/pdfapp.h
apps/x11_main.c
apps/xpsdraw.c
draw/draw_device.c
draw/draw_scale.c
fitz/base_object.c
fitz/fitz.h
pdf/mupdf.h
pdf/pdf_interpret.c
pdf/pdf_outline.c
pdf/pdf_page.c
xps/muxps.h
xps/xps_doc.c
xps/xps_xml.c
Diffstat (limited to 'pdf/mupdf.h')
-rw-r--r-- | pdf/mupdf.h | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/pdf/mupdf.h b/pdf/mupdf.h index 727d28e2..d3eb72e6 100644 --- a/pdf/mupdf.h +++ b/pdf/mupdf.h @@ -410,7 +410,6 @@ void pdf_debug_font(pdf_font_desc *fontdesc); typedef struct pdf_link_s pdf_link; typedef struct pdf_annot_s pdf_annot; -typedef struct pdf_outline_s pdf_outline; typedef enum pdf_link_kind_e { @@ -438,22 +437,11 @@ struct pdf_annot_s pdf_annot *next; }; -struct pdf_outline_s -{ - char *title; - pdf_link *link; - int count; - pdf_outline *child; - pdf_outline *next; -}; - fz_obj *pdf_lookup_dest(pdf_xref *xref, fz_obj *needle); fz_obj *pdf_lookup_name(pdf_xref *xref, char *which, fz_obj *needle); fz_obj *pdf_load_name_tree(pdf_xref *xref, char *which); -pdf_outline *pdf_load_outline(pdf_xref *xref); -void pdf_debug_outline(fz_context *ctx, pdf_outline *outline, int level); -void pdf_free_outline(fz_context *ctx, pdf_outline *outline); +fz_outline *pdf_load_outline(pdf_xref *xref); pdf_link *pdf_load_link(pdf_xref *xref, fz_obj *dict); void pdf_load_links(pdf_link **, pdf_xref *, fz_obj *annots); |