fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2026-05-05 04:08:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

pdf: Fix wrong cairo_pdf_outline_flags_t item prefix

Browse source
This commit is contained in:
Kouhei Sutou 2017-01-04 23:38:17 +09:00 • committed by Adrian Johnson
parent c7e87cd9df
commit dd4706d0a9
3 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/cairo-pdf-interchange.c
View file

@ -579,9 +579,9 @@ cairo_pdf_interchange_write_outline (cairo_pdf_surface_t *surface)
if (outline->flags) {
int flags = 0;
if (outline->flags & CAIRO_BOOKMARK_FLAG_ITALIC)
if (outline->flags & CAIRO_PDF_OUTLINE_FLAG_ITALIC)
flags |= 1;
if (outline->flags & CAIRO_BOOKMARK_FLAG_BOLD)
if (outline->flags & CAIRO_PDF_OUTLINE_FLAG_BOLD)
flags |= 2;
_cairo_output_stream_printf (surface->output,
" /F %d\n",
@ -1338,7 +1338,7 @@ _cairo_pdf_interchange_add_outline (cairo_pdf_surface_t *surface,
/* Update Count */
outline = outline->parent;
while (outline) {
if (outline->flags & CAIRO_BOOKMARK_FLAG_OPEN) {
if (outline->flags & CAIRO_PDF_OUTLINE_FLAG_OPEN) {
outline->count++;
} else {
outline->count--;

12
src/cairo-pdf.h
View file

@ -87,9 +87,9 @@ cairo_pdf_surface_set_size (cairo_surface_t *surface,
/**
* cairo_pdf_outline_flags_t:
* @CAIRO_BOOKMARK_FLAG_OPEN: The outline item defaults to open in the PDF viewer (Since 1.16)
* @CAIRO_BOOKMARK_FLAG_BOLD: The outline item is displayed by the viewer in bold text (Since 1.16)
* @CAIRO_BOOKMARK_FLAG_ITALIC: The outline item is displayed by the viewer in italic text (Since 1.16)
* @CAIRO_PDF_OUTLINE_FLAG_OPEN: The outline item defaults to open in the PDF viewer (Since 1.16)
* @CAIRO_PDF_OUTLINE_FLAG_BOLD: The outline item is displayed by the viewer in bold text (Since 1.16)
* @CAIRO_PDF_OUTLINE_FLAG_ITALIC: The outline item is displayed by the viewer in italic text (Since 1.16)
*
* #cairo_pdf_outline_flags_t is used by the
* cairo_pdf_surface_add_outline() function specify the attributes of
@ -99,9 +99,9 @@ cairo_pdf_surface_set_size (cairo_surface_t *surface,
* Since: 1.16
**/
typedef enum _cairo_pdf_outline_flags {
CAIRO_BOOKMARK_FLAG_OPEN = 0x1,
CAIRO_BOOKMARK_FLAG_BOLD = 0x2,
CAIRO_BOOKMARK_FLAG_ITALIC = 0x4,
CAIRO_PDF_OUTLINE_FLAG_OPEN = 0x1,
CAIRO_PDF_OUTLINE_FLAG_BOLD = 0x2,
CAIRO_PDF_OUTLINE_FLAG_ITALIC = 0x4,
} cairo_pdf_outline_flags_t;
#define CAIRO_PDF_OUTLINE_ROOT 0

7
test/pdf-tagged-text.c
View file

@ -244,7 +244,7 @@ draw_section (cairo_surface_t *surface, cairo_t *cr, const struct section *secti
cairo_tag_end (cr, CAIRO_TAG_DEST);
cairo_tag_end (cr, "H1");
y_pos = MARGIN + HEADING_HEIGHT;
flags = CAIRO_BOOKMARK_FLAG_BOLD | CAIRO_BOOKMARK_FLAG_OPEN;
flags = CAIRO_PDF_OUTLINE_FLAG_BOLD | CAIRO_PDF_OUTLINE_FLAG_OPEN;
outline_parents[0] = cairo_pdf_surface_add_outline (surface,
CAIRO_PDF_OUTLINE_ROOT,
section->heading,
@ -256,7 +256,7 @@ draw_section (cairo_surface_t *surface, cairo_t *cr, const struct section *secti
flags = 0;
} else {
cairo_set_font_size(cr, HEADING3_SIZE);
flags = CAIRO_BOOKMARK_FLAG_ITALIC;
flags = CAIRO_PDF_OUTLINE_FLAG_ITALIC;
}
if (y_pos + HEADING_HEIGHT + paragraph_height + MARGIN > PAGE_HEIGHT) {
@ -335,7 +335,8 @@ create_document (cairo_surface_t *surface, cairo_t *cr)
cairo_pdf_surface_add_outline (surface,
CAIRO_PDF_OUTLINE_ROOT,
"Contents", "TOC", CAIRO_BOOKMARK_FLAG_BOLD);
"Contents", "TOC",
CAIRO_PDF_OUTLINE_FLAG_BOLD);
cairo_tag_begin (cr, CAIRO_TAG_DEST, "name='TOC'");
cairo_tag_begin (cr, "TOC", NULL);