From: Evan Nemerson Date: Mon, 30 Jan 2012 06:44:20 +0000 (-0800) Subject: poppler-glib: switch to GIR X-Git-Tag: 0.15.2~32 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=33618d59d90e52a610aa4f35b34a52d5f0b97582;p=thirdparty%2Fvala.git poppler-glib: switch to GIR --- diff --git a/vapi/Makefile.am b/vapi/Makefile.am index cf4b075fb..26228e27e 100644 --- a/vapi/Makefile.am +++ b/vapi/Makefile.am @@ -487,7 +487,7 @@ pangocairo: $(GENVAPI) --library $(srcdir)/pangocairo --metadatadir $(METADATADIR) $(GIRDIR)/PangoCairo-1.0.gir poppler-glib: - $(GENVAPI) --library $(srcdir)/poppler-glib $(PACKAGESDIR)/poppler-glib/poppler-glib.gi + $(GENVAPI) --library $(srcdir)/poppler-glib --metadatadir $(METADATADIR) $(GIRDIR)/Poppler-0.18.gir purple: $(GENVAPI) --library $(srcdir)/purple $(PACKAGESDIR)/purple/purple-custom.vala $(PACKAGESDIR)/purple/purple.gi diff --git a/vapi/metadata/Poppler-0.18.metadata b/vapi/metadata/Poppler-0.18.metadata new file mode 100644 index 000000000..4fb88d3f8 --- /dev/null +++ b/vapi/metadata/Poppler-0.18.metadata @@ -0,0 +1,17 @@ +Page + .get_image type="Cairo.Surface" + .get_selected_region type="Cairo.Region" + .get_thumbnail type="Cairo.Surface" + .render*.cairo type="Cairo.Context" + +Rectangle struct + +// Ownership of fields +*.*#field unowned=false +ActionLayer.layers unowned + +ANNOT_TEXT_ICON_* parent="Poppler.AnnotTextIcon" name="ANNOT_TEXT_ICON_(.+)" + +ActionLayer.layers type_arguments="Poppler.ActionLayer" +ActionOCGState.state_list type_arguments="Poppler.ActionLayer" +_AttachmentClass skip diff --git a/vapi/packages/poppler-glib/poppler-glib.deps b/vapi/packages/poppler-glib/poppler-glib.deps deleted file mode 100644 index 70df1eab5..000000000 --- a/vapi/packages/poppler-glib/poppler-glib.deps +++ /dev/null @@ -1,5 +0,0 @@ -gio-2.0 -pango -gdk-pixbuf-2.0 -gdk-2.0 -cairo diff --git a/vapi/packages/poppler-glib/poppler-glib.files b/vapi/packages/poppler-glib/poppler-glib.files deleted file mode 100644 index f2b06a8f1..000000000 --- a/vapi/packages/poppler-glib/poppler-glib.files +++ /dev/null @@ -1,2 +0,0 @@ -include/poppler/glib -lib/libpoppler-glib.so diff --git a/vapi/packages/poppler-glib/poppler-glib.gi b/vapi/packages/poppler-glib/poppler-glib.gi deleted file mode 100644 index abadaecf0..000000000 --- a/vapi/packages/poppler-glib/poppler-glib.gi +++ /dev/null @@ -1,1370 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vapi/packages/poppler-glib/poppler-glib.metadata b/vapi/packages/poppler-glib/poppler-glib.metadata deleted file mode 100644 index d1e0150e9..000000000 --- a/vapi/packages/poppler-glib/poppler-glib.metadata +++ /dev/null @@ -1,24 +0,0 @@ -Poppler cheader_filename="poppler.h" -poppler_action_copy transfer_ownership="1" -poppler_dest_copy transfer_ownership="1" -poppler_document_new_from_file.password nullable="1" -poppler_fonts_iter_copy transfer_ownership="1" -poppler_form_field_mapping_copy transfer_ownership="1" -poppler_image_mapping_copy transfer_ownership="1" -poppler_index_iter_copy transfer_ownership="1" -poppler_link_mapping_copy transfer_ownership="1" -poppler_page_get_crop_box.rect is_out="1" -poppler_page_get_size.width is_out="1" -poppler_page_get_size.height is_out="1" -poppler_page_transition_copy transfer_ownership="1" -PopplerRectangle is_value_type="1" -poppler_rectangle_new hidden="1" -poppler_rectangle_copy hidden="1" -poppler_rectangle_free hidden="1" -PopplerActionAny is_value_type="1" has_type_id="0" -PopplerActionGotoDest is_value_type="1" has_type_id="0" -PopplerActionGotoRemote is_value_type="1" has_type_id="0" -PopplerActionLaunch is_value_type="1" has_type_id="0" -PopplerActionUri is_value_type="1" has_type_id="0" -PopplerActionNamed is_value_type="1" has_type_id="0" -PopplerActionMovie is_value_type="1" has_type_id="0" diff --git a/vapi/packages/poppler-glib/poppler-glib.namespace b/vapi/packages/poppler-glib/poppler-glib.namespace deleted file mode 100644 index 7843392b7..000000000 --- a/vapi/packages/poppler-glib/poppler-glib.namespace +++ /dev/null @@ -1 +0,0 @@ -Poppler diff --git a/vapi/poppler-glib.vapi b/vapi/poppler-glib.vapi index 5759cc1bc..2be38a092 100644 --- a/vapi/poppler-glib.vapi +++ b/vapi/poppler-glib.vapi @@ -1,32 +1,59 @@ /* poppler-glib.vapi generated by vapigen, do not modify. */ +[CCode (cprefix = "Poppler", gir_namespace = "Poppler", gir_version = "0.18", lower_case_cprefix = "poppler_")] namespace Poppler { - [CCode (cheader_filename = "poppler.h", copy_function = "poppler_action_copy", type_id = "poppler_action_get_type ()")] + namespace AnnotTextIcon { + [CCode (cheader_filename = "poppler.h", cname = "POPPLER_ANNOT_TEXT_ICON_CIRCLE")] + public const string CIRCLE; + [CCode (cheader_filename = "poppler.h", cname = "POPPLER_ANNOT_TEXT_ICON_COMMENT")] + public const string COMMENT; + [CCode (cheader_filename = "poppler.h", cname = "POPPLER_ANNOT_TEXT_ICON_CROSS")] + public const string CROSS; + [CCode (cheader_filename = "poppler.h", cname = "POPPLER_ANNOT_TEXT_ICON_HELP")] + public const string HELP; + [CCode (cheader_filename = "poppler.h", cname = "POPPLER_ANNOT_TEXT_ICON_INSERT")] + public const string INSERT; + [CCode (cheader_filename = "poppler.h", cname = "POPPLER_ANNOT_TEXT_ICON_KEY")] + public const string KEY; + [CCode (cheader_filename = "poppler.h", cname = "POPPLER_ANNOT_TEXT_ICON_NEW_PARAGRAPH")] + public const string NEW_PARAGRAPH; + [CCode (cheader_filename = "poppler.h", cname = "POPPLER_ANNOT_TEXT_ICON_NOTE")] + public const string NOTE; + [CCode (cheader_filename = "poppler.h", cname = "POPPLER_ANNOT_TEXT_ICON_PARAGRAPH")] + public const string PARAGRAPH; + } + [CCode (cheader_filename = "poppler.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "poppler_action_get_type ()")] [Compact] public class Action { public Poppler.ActionAny any; public Poppler.ActionGotoDest goto_dest; public Poppler.ActionGotoRemote goto_remote; + public Poppler.ActionJavascript javascript; public Poppler.ActionLaunch launch; public Poppler.ActionMovie movie; public Poppler.ActionNamed named; + public Poppler.ActionOCGState ocg_state; + public Poppler.ActionRendition rendition; public Poppler.ActionType type; public Poppler.ActionUri uri; public Poppler.Action copy (); + public void free (); } - [CCode (cheader_filename = "poppler.h")] + [CCode (cheader_filename = "poppler.h", type_id = "poppler_annot_get_type ()")] public class Annot : GLib.Object { [CCode (has_construct_function = false)] protected Annot (); public Poppler.AnnotType get_annot_type (); - public unowned Poppler.Color get_color (); - public unowned string get_contents (); + public Poppler.Color get_color (); + public string get_contents (); public Poppler.AnnotFlag get_flags (); - public unowned string get_modified (); - public unowned string get_name (); + public string get_modified (); + public string get_name (); + public int get_page_index (); + public void set_color (Poppler.Color? poppler_color); public void set_contents (string contents); } - [CCode (cheader_filename = "poppler.h", copy_function = "poppler_annot_callout_line_copy", type_id = "poppler_annot_callout_line_get_type ()")] + [CCode (cheader_filename = "poppler.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "poppler_annot_callout_line_get_type ()")] [Compact] public class AnnotCalloutLine { public bool multiline; @@ -38,60 +65,88 @@ namespace Poppler { public double y3; [CCode (has_construct_function = false)] public AnnotCalloutLine (); - public unowned Poppler.AnnotCalloutLine copy (); + public Poppler.AnnotCalloutLine copy (); + public void free (); } - [CCode (cheader_filename = "poppler.h")] + [CCode (cheader_filename = "poppler.h", type_id = "poppler_annot_file_attachment_get_type ()")] + public class AnnotFileAttachment : Poppler.AnnotMarkup { + [CCode (has_construct_function = false)] + protected AnnotFileAttachment (); + public Poppler.Attachment get_attachment (); + public string get_name (); + } + [CCode (cheader_filename = "poppler.h", type_id = "poppler_annot_free_text_get_type ()")] public class AnnotFreeText : Poppler.AnnotMarkup { [CCode (has_construct_function = false)] protected AnnotFreeText (); - public unowned Poppler.AnnotCalloutLine get_callout_line (); + public Poppler.AnnotCalloutLine get_callout_line (); public Poppler.AnnotFreeTextQuadding get_quadding (); } - [CCode (cheader_filename = "poppler.h", copy_function = "poppler_annot_mapping_copy", type_id = "poppler_annot_mapping_get_type ()")] + [CCode (cheader_filename = "poppler.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "poppler_annot_mapping_get_type ()")] [Compact] public class AnnotMapping { - public weak Poppler.Annot annot; + public Poppler.Annot annot; public Poppler.Rectangle area; [CCode (has_construct_function = false)] public AnnotMapping (); - public unowned Poppler.AnnotMapping copy (); + public Poppler.AnnotMapping copy (); + public void free (); } - [CCode (cheader_filename = "poppler.h")] + [CCode (cheader_filename = "poppler.h", type_id = "poppler_annot_markup_get_type ()")] public class AnnotMarkup : Poppler.Annot { [CCode (has_construct_function = false)] protected AnnotMarkup (); public GLib.Date get_date (); public Poppler.AnnotExternalDataType get_external_data (); - public unowned string get_label (); + public string get_label (); public double get_opacity (); public bool get_popup_is_open (); - public bool get_popup_rectangle (Poppler.Rectangle poppler_rect); + public bool get_popup_rectangle (out Poppler.Rectangle poppler_rect); public Poppler.AnnotMarkupReplyType get_reply_to (); - public unowned string get_subject (); + public string get_subject (); public bool has_popup (); + public void set_label (string? label); + public void set_opacity (double opacity); + public void set_popup (Poppler.Rectangle popup_rect); + public void set_popup_is_open (bool is_open); } - [CCode (cheader_filename = "poppler.h")] - public class AnnotText : Poppler.AnnotMarkup { + [CCode (cheader_filename = "poppler.h", type_id = "poppler_annot_movie_get_type ()")] + public class AnnotMovie : Poppler.Annot { [CCode (has_construct_function = false)] - protected AnnotText (); - public unowned string get_icon (); + protected AnnotMovie (); + public unowned Poppler.Movie get_movie (); + public string get_title (); + } + [CCode (cheader_filename = "poppler.h", type_id = "poppler_annot_screen_get_type ()")] + public class AnnotScreen : Poppler.Annot { + [CCode (has_construct_function = false)] + protected AnnotScreen (); + public unowned Poppler.Action get_action (); + } + [CCode (cheader_filename = "poppler.h", type_id = "poppler_annot_text_get_type ()")] + public class AnnotText : Poppler.AnnotMarkup { + [CCode (has_construct_function = false, type = "PopplerAnnot*")] + public AnnotText (Poppler.Document doc, Poppler.Rectangle rect); + public string get_icon (); public bool get_is_open (); public Poppler.AnnotTextState get_state (); + public void set_icon (string icon); + public void set_is_open (bool is_open); } - [CCode (cheader_filename = "poppler.h")] + [CCode (cheader_filename = "poppler.h", type_id = "poppler_attachment_get_type ()")] public class Attachment : GLib.Object { - public weak GLib.StringBuilder checksum; + public GLib.StringBuilder checksum; public GLib.Time ctime; - public weak string description; + public string description; public GLib.Time mtime; - public weak string name; + public string name; public size_t size; [CCode (has_construct_function = false)] protected Attachment (); public bool save (string filename) throws GLib.Error; public bool save_to_callback (Poppler.AttachmentSaveFunc save_func) throws GLib.Error; } - [CCode (cheader_filename = "poppler.h", copy_function = "poppler_color_copy", type_id = "poppler_color_get_type ()")] + [CCode (cheader_filename = "poppler.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "poppler_color_get_type ()")] [Compact] public class Color { public uint16 blue; @@ -99,9 +154,10 @@ namespace Poppler { public uint16 red; [CCode (has_construct_function = false)] public Color (); - public unowned Poppler.Color copy (); + public Poppler.Color copy (); + public void free (); } - [CCode (cheader_filename = "poppler.h", copy_function = "poppler_dest_copy", type_id = "poppler_dest_get_type ()")] + [CCode (cheader_filename = "poppler.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "poppler_dest_get_type ()")] [Compact] public class Dest { public double bottom; @@ -109,36 +165,51 @@ namespace Poppler { public uint change_top; public uint change_zoom; public double left; - public weak string named_dest; + public string named_dest; public int page_num; public double right; public double top; public Poppler.DestType type; public double zoom; public Poppler.Dest copy (); + public void free (); } - [CCode (cheader_filename = "poppler.h")] + [CCode (cheader_filename = "poppler.h", type_id = "poppler_document_get_type ()")] public class Document : GLib.Object { [CCode (has_construct_function = false)] protected Document (); - public unowned Poppler.Dest find_dest (string link_name); + public Poppler.Dest find_dest (string link_name); [CCode (has_construct_function = false)] - public Document.from_data (string data, int length, string password) throws GLib.Error; + public Document.from_data (string data, int length, string? password) throws GLib.Error; [CCode (has_construct_function = false)] public Document.from_file (string uri, string? password) throws GLib.Error; - public unowned GLib.List get_attachments (); - public unowned Poppler.FormField get_form_field (int id); + public GLib.List get_attachments (); + public string get_author (); + public long get_creation_date (); + public string get_creator (); + public Poppler.FormField get_form_field (int id); + public bool get_id (out string permanent_id, out string update_id); + public string get_keywords (); + public string get_metadata (); + public long get_modification_date (); + public uint get_n_attachments (); public int get_n_pages (); - public unowned Poppler.Page get_page (int index); - public unowned Poppler.Page get_page_by_label (string label); + public Poppler.Page get_page (int index); + public Poppler.Page get_page_by_label (string label); + public Poppler.PageLayout get_page_layout (); + public Poppler.PageMode get_page_mode (); + public void get_pdf_version (out uint major_version, out uint minor_version); + public string get_pdf_version_string (); + public Poppler.Permissions get_permissions (); + public string get_producer (); + public string get_subject (); + public string get_title (); public bool has_attachments (); + public bool is_linearized (); public bool save (string uri) throws GLib.Error; public bool save_a_copy (string uri) throws GLib.Error; - [NoAccessorMethod] public string author { owned get; } - [NoAccessorMethod] public int creation_date { get; } - [NoAccessorMethod] public string creator { owned get; } [NoAccessorMethod] public string format { owned get; } @@ -146,40 +217,33 @@ namespace Poppler { public uint format_major { get; } [NoAccessorMethod] public uint format_minor { get; } - [NoAccessorMethod] public string keywords { owned get; } [NoAccessorMethod] - public string linearized { owned get; } - [NoAccessorMethod] + public bool linearized { get; } public string metadata { owned get; } [NoAccessorMethod] public int mod_date { get; } - [NoAccessorMethod] public Poppler.PageLayout page_layout { get; } - [NoAccessorMethod] public Poppler.PageMode page_mode { get; } - [NoAccessorMethod] public Poppler.Permissions permissions { get; } - [NoAccessorMethod] public string producer { owned get; } - [NoAccessorMethod] public string subject { owned get; } - [NoAccessorMethod] public string title { owned get; } [NoAccessorMethod] public Poppler.ViewerPreferences viewer_preferences { get; } } - [CCode (cheader_filename = "poppler.h")] + [CCode (cheader_filename = "poppler.h", type_id = "poppler_font_info_get_type ()")] public class FontInfo : GLib.Object { [CCode (has_construct_function = false)] public FontInfo (Poppler.Document document); public void free (); - public bool scan (int n_pages, out unowned Poppler.FontsIter iter); + public bool scan (int n_pages, out Poppler.FontsIter iter); } - [CCode (cheader_filename = "poppler.h", copy_function = "poppler_fonts_iter_copy", type_id = "poppler_fonts_iter_get_type ()")] + [CCode (cheader_filename = "poppler.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "poppler_fonts_iter_get_type ()")] [Compact] public class FontsIter { public Poppler.FontsIter copy (); + public void free (); public unowned string get_file_name (); public Poppler.FontType get_font_type (); public unowned string get_full_name (); @@ -188,7 +252,7 @@ namespace Poppler { public bool is_subset (); public bool next (); } - [CCode (cheader_filename = "poppler.h")] + [CCode (cheader_filename = "poppler.h", type_id = "poppler_form_field_get_type ()")] public class FormField : GLib.Object { [CCode (has_construct_function = false)] protected FormField (); @@ -199,38 +263,43 @@ namespace Poppler { public bool choice_commit_on_change (); public bool choice_do_spell_check (); public Poppler.FormChoiceType choice_get_choice_type (); - public unowned string choice_get_item (int index); + public string choice_get_item (int index); public int choice_get_n_items (); - public unowned string choice_get_text (); + public string choice_get_text (); public bool choice_is_editable (); public bool choice_is_item_selected (int index); public void choice_select_item (int index); public void choice_set_text (string text); public void choice_toggle_item (int index); public void choice_unselect_all (); + public unowned Poppler.Action get_action (); public Poppler.FormFieldType get_field_type (); public double get_font_size (); public int get_id (); + public string get_mapping_name (); + public string get_name (); + public string get_partial_name (); public bool is_read_only (); public bool text_do_scroll (); public bool text_do_spell_check (); public int text_get_max_len (); - public unowned string text_get_text (); + public string text_get_text (); public Poppler.FormTextType text_get_text_type (); public bool text_is_password (); public bool text_is_rich_text (); public void text_set_text (string text); } - [CCode (cheader_filename = "poppler.h", copy_function = "poppler_form_field_mapping_copy", type_id = "poppler_form_field_mapping_get_type ()")] + [CCode (cheader_filename = "poppler.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "poppler_form_field_mapping_get_type ()")] [Compact] public class FormFieldMapping { public Poppler.Rectangle area; - public weak Poppler.FormField field; + public Poppler.FormField field; [CCode (has_construct_function = false)] public FormFieldMapping (); public Poppler.FormFieldMapping copy (); + public void free (); } - [CCode (cheader_filename = "poppler.h", copy_function = "poppler_image_mapping_copy", type_id = "poppler_image_mapping_get_type ()")] + [CCode (cheader_filename = "poppler.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "poppler_image_mapping_get_type ()")] [Compact] public class ImageMapping { public Poppler.Rectangle area; @@ -238,19 +307,21 @@ namespace Poppler { [CCode (has_construct_function = false)] public ImageMapping (); public Poppler.ImageMapping copy (); + public void free (); } - [CCode (cheader_filename = "poppler.h", copy_function = "poppler_index_iter_copy", type_id = "poppler_index_iter_get_type ()")] + [CCode (cheader_filename = "poppler.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "poppler_index_iter_get_type ()")] [Compact] public class IndexIter { [CCode (has_construct_function = false)] public IndexIter (Poppler.Document document); public Poppler.IndexIter copy (); - public unowned Poppler.Action get_action (); - public unowned Poppler.IndexIter get_child (); + public void free (); + public Poppler.Action get_action (); + public Poppler.IndexIter get_child (); public bool is_open (); public bool next (); } - [CCode (cheader_filename = "poppler.h")] + [CCode (cheader_filename = "poppler.h", type_id = "poppler_layer_get_type ()")] public class Layer : GLib.Object { [CCode (has_construct_function = false)] protected Layer (); @@ -261,27 +332,47 @@ namespace Poppler { public bool is_visible (); public void show (); } - [CCode (cheader_filename = "poppler.h", copy_function = "poppler_layers_iter_copy", type_id = "poppler_layers_iter_get_type ()")] + [CCode (cheader_filename = "poppler.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "poppler_layers_iter_get_type ()")] [Compact] public class LayersIter { [CCode (has_construct_function = false)] public LayersIter (Poppler.Document document); - public unowned Poppler.LayersIter copy (); - public unowned Poppler.LayersIter get_child (); - public unowned Poppler.Layer get_layer (); - public unowned string get_title (); + public Poppler.LayersIter copy (); + public void free (); + public Poppler.LayersIter get_child (); + public Poppler.Layer get_layer (); + public string get_title (); public bool next (); } - [CCode (cheader_filename = "poppler.h", copy_function = "poppler_link_mapping_copy", type_id = "poppler_link_mapping_get_type ()")] + [CCode (cheader_filename = "poppler.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "poppler_link_mapping_get_type ()")] [Compact] public class LinkMapping { - public weak Poppler.Action action; + public Poppler.Action action; public Poppler.Rectangle area; [CCode (has_construct_function = false)] public LinkMapping (); public Poppler.LinkMapping copy (); + public void free (); } - [CCode (cheader_filename = "poppler.h")] + [CCode (cheader_filename = "poppler.h", type_id = "poppler_media_get_type ()")] + public class Media : GLib.Object { + [CCode (has_construct_function = false)] + protected Media (); + public unowned string get_filename (); + public unowned string get_mime_type (); + public bool is_embedded (); + public bool save (string filename) throws GLib.Error; + public bool save_to_callback (Poppler.MediaSaveFunc save_func) throws GLib.Error; + } + [CCode (cheader_filename = "poppler.h", type_id = "poppler_movie_get_type ()")] + public class Movie : GLib.Object { + [CCode (has_construct_function = false)] + protected Movie (); + public unowned string get_filename (); + public bool need_poster (); + public bool show_controls (); + } + [CCode (cheader_filename = "poppler.h", type_id = "poppler_ps_file_get_type ()")] public class PSFile : GLib.Object { [CCode (has_construct_function = false)] public PSFile (Poppler.Document document, string filename, int first_page, int n_pages); @@ -289,42 +380,46 @@ namespace Poppler { public void set_duplex (bool duplex); public void set_paper_size (double width, double height); } - [CCode (cheader_filename = "poppler.h")] + [CCode (cheader_filename = "poppler.h", type_id = "poppler_page_get_type ()")] public class Page : GLib.Object { [CCode (has_construct_function = false)] protected Page (); - public unowned GLib.List find_text (string text); - public static void free_annot_mapping (GLib.List list); - public static void free_form_field_mapping (GLib.List list); - public static void free_image_mapping (GLib.List list); - public static void free_link_mapping (GLib.List list); - public unowned GLib.List get_annot_mapping (); - public void get_crop_box (out Poppler.Rectangle rect); + public void add_annot (Poppler.Annot annot); + public GLib.List find_text (string text); + public static void free_annot_mapping (GLib.List list); + public static void free_form_field_mapping (GLib.List list); + public static void free_image_mapping (GLib.List list); + public static void free_link_mapping (GLib.List list); + public static void free_text_attributes (GLib.List list); + public GLib.List get_annot_mapping (); + public Poppler.Rectangle get_crop_box (); public double get_duration (); - public unowned GLib.List get_form_field_mapping (); - public unowned Cairo.Surface get_image (int image_id); - public unowned GLib.List get_image_mapping (); + public GLib.List get_form_field_mapping (); + public Cairo.Surface get_image (int image_id); + public GLib.List get_image_mapping (); public int get_index (); - public unowned GLib.List get_link_mapping (); - public unowned GLib.List get_selection_region (double scale, Poppler.SelectionStyle style, Poppler.Rectangle selection); + public string get_label (); + public GLib.List get_link_mapping (); + public Cairo.Region get_selected_region (double scale, Poppler.SelectionStyle style, Poppler.Rectangle selection); + public string get_selected_text (Poppler.SelectionStyle style, Poppler.Rectangle selection); + [Deprecated (since = "0.16")] + public GLib.List get_selection_region (double scale, Poppler.SelectionStyle style, Poppler.Rectangle selection); public void get_size (out double width, out double height); - public unowned string get_text (Poppler.SelectionStyle style, Poppler.Rectangle rect); - public unowned Cairo.Surface get_thumbnail (); - public unowned Gdk.Pixbuf get_thumbnail_pixbuf (); + public string get_text (); + public GLib.List get_text_attributes (); + public bool get_text_layout ([CCode (array_length_cname = "n_rectangles", array_length_pos = 1.1, array_length_type = "guint")] out Poppler.Rectangle[] rectangles); + public Cairo.Surface get_thumbnail (); public bool get_thumbnail_size (int width, int height); - public unowned Poppler.PageTransition get_transition (); - public void render (Cairo.Context cairo); - public void render_for_printing (Cairo.Context cairo); - public void render_selection (Cairo.Context cairo, Poppler.Rectangle selection, Poppler.Rectangle old_selection, Poppler.SelectionStyle style, Poppler.Color glyph_color, Poppler.Color background_color); - public void render_selection_to_pixbuf (double scale, int rotation, Gdk.Pixbuf pixbuf, Poppler.Rectangle selection, Poppler.Rectangle old_selection, Poppler.SelectionStyle style, Gdk.Color glyph_color, Gdk.Color background_color); - public void render_to_pixbuf (int src_x, int src_y, int src_width, int src_height, double scale, int rotation, Gdk.Pixbuf pixbuf); - public void render_to_pixbuf_for_printing (int src_x, int src_y, int src_width, int src_height, double scale, int rotation, Gdk.Pixbuf pixbuf); + public Poppler.PageTransition get_transition (); + public void render ([CCode (type = "cairo_t*")] Cairo.Context cairo); + public void render_for_printing ([CCode (type = "cairo_t*")] Cairo.Context cairo); + public void render_for_printing_with_options ([CCode (type = "cairo_t*")] Cairo.Context cairo, Poppler.PrintFlags options); + public void render_selection ([CCode (type = "cairo_t*")] Cairo.Context cairo, Poppler.Rectangle selection, Poppler.Rectangle old_selection, Poppler.SelectionStyle style, Poppler.Color glyph_color, Poppler.Color background_color); public void render_to_ps (Poppler.PSFile ps_file); - public static void selection_region_free (GLib.List region); - [NoAccessorMethod] + public static void selection_region_free (GLib.List region); public string label { owned get; } } - [CCode (cheader_filename = "poppler.h", copy_function = "poppler_page_transition_copy", type_id = "poppler_page_transition_get_type ()")] + [CCode (cheader_filename = "poppler.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "poppler_page_transition_get_type ()")] [Compact] public class PageTransition { public Poppler.PageTransitionAlignment alignment; @@ -337,55 +432,113 @@ namespace Poppler { [CCode (has_construct_function = false)] public PageTransition (); public Poppler.PageTransition copy (); + public void free (); + } + [CCode (cheader_filename = "poppler.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "poppler_text_attributes_get_type ()")] + [Compact] + public class TextAttributes { + public Poppler.Color color; + public int end_index; + public string font_name; + public double font_size; + public bool is_underlined; + public int start_index; + [CCode (has_construct_function = false)] + public TextAttributes (); + public Poppler.TextAttributes copy (); + public void free (); } [CCode (cheader_filename = "poppler.h", has_type_id = false)] public struct ActionAny { public Poppler.ActionType type; - public weak string title; + public string title; } [CCode (cheader_filename = "poppler.h", has_type_id = false)] public struct ActionGotoDest { public Poppler.ActionType type; - public weak string title; - public weak Poppler.Dest dest; + public string title; + public Poppler.Dest dest; } [CCode (cheader_filename = "poppler.h", has_type_id = false)] public struct ActionGotoRemote { public Poppler.ActionType type; - public weak string title; - public weak string file_name; - public weak Poppler.Dest dest; + public string title; + public string file_name; + public Poppler.Dest dest; + } + [CCode (cheader_filename = "poppler.h", has_type_id = false)] + public struct ActionJavascript { + public Poppler.ActionType type; + public string title; + public string script; } [CCode (cheader_filename = "poppler.h", has_type_id = false)] public struct ActionLaunch { public Poppler.ActionType type; - public weak string title; - public weak string file_name; - public weak string @params; + public string title; + public string file_name; + public string @params; + } + [CCode (cheader_filename = "poppler.h", has_type_id = false)] + public struct ActionLayer { + public Poppler.ActionLayerAction action; + public weak GLib.List layers; } [CCode (cheader_filename = "poppler.h", has_type_id = false)] public struct ActionMovie { public Poppler.ActionType type; - public weak string title; + public string title; + public Poppler.ActionMovieOperation operation; + public Poppler.Movie movie; } [CCode (cheader_filename = "poppler.h", has_type_id = false)] public struct ActionNamed { public Poppler.ActionType type; - public weak string title; - public weak string named_dest; + public string title; + public string named_dest; + } + [CCode (cheader_filename = "poppler.h", has_type_id = false)] + public struct ActionOCGState { + public Poppler.ActionType type; + public string title; + public GLib.List state_list; + } + [CCode (cheader_filename = "poppler.h", has_type_id = false)] + public struct ActionRendition { + public Poppler.ActionType type; + public string title; + public int op; + public Poppler.Media media; } [CCode (cheader_filename = "poppler.h", has_type_id = false)] public struct ActionUri { public Poppler.ActionType type; - public weak string title; - public weak string uri; + public string title; + public string uri; } - [CCode (cheader_filename = "poppler.h")] + [CCode (cheader_filename = "poppler.h", type_id = "poppler_rectangle_get_type ()")] public struct Rectangle { public double x1; public double y1; public double x2; public double y2; + [CCode (has_construct_function = false, type = "PopplerRectangle*")] + public Rectangle (); + public Poppler.Rectangle copy (); + public void free (); + } + [CCode (cheader_filename = "poppler.h", cprefix = "POPPLER_ACTION_LAYER_")] + public enum ActionLayerAction { + ON, + OFF, + TOGGLE + } + [CCode (cheader_filename = "poppler.h", cprefix = "POPPLER_ACTION_MOVIE_")] + public enum ActionMovieOperation { + PLAY, + PAUSE, + RESUME, + STOP } [CCode (cheader_filename = "poppler.h", cprefix = "POPPLER_ACTION_")] public enum ActionType { @@ -396,7 +549,10 @@ namespace Poppler { LAUNCH, URI, NAMED, - MOVIE + MOVIE, + RENDITION, + OCG_STATE, + JAVASCRIPT } [CCode (cheader_filename = "poppler.h", cprefix = "POPPLER_ANNOT_EXTERNAL_DATA_MARKUP_")] public enum AnnotExternalDataType { @@ -488,14 +644,6 @@ namespace Poppler { FITBV, NAMED } - [CCode (cheader_filename = "poppler.h", cprefix = "POPPLER_ERROR_")] - public enum Error { - INVALID, - ENCRYPTED, - OPEN_FILE, - BAD_CATALOG, - DAMAGED - } [CCode (cheader_filename = "poppler.h", cprefix = "POPPLER_FONT_TYPE_")] public enum FontType { UNKNOWN, @@ -596,8 +744,19 @@ namespace Poppler { OK_TO_COPY, OK_TO_ADD_NOTES, OK_TO_FILL_FORM, + OK_TO_EXTRACT_CONTENTS, + OK_TO_ASSEMBLE, + OK_TO_PRINT_HIGH_RESOLUTION, FULL } + [CCode (cheader_filename = "poppler.h", cprefix = "POPPLER_PRINT_")] + [Flags] + public enum PrintFlags { + DOCUMENT, + MARKUP_ANNOTS, + STAMP_ANNOTS_ONLY, + ALL + } [CCode (cheader_filename = "poppler.h", cprefix = "POPPLER_SELECTION_")] public enum SelectionStyle { GLYPH, @@ -616,22 +775,29 @@ namespace Poppler { DISPLAY_DOC_TITLE, DIRECTION_RTL } - [CCode (cheader_filename = "poppler.h", has_target = false)] - public delegate bool AttachmentSaveFunc (string buf, size_t count, void* data) throws GLib.Error; - [CCode (cheader_filename = "poppler.h")] + [CCode (cheader_filename = "poppler.h", cprefix = "POPPLER_ERROR_")] + public errordomain Error { + INVALID, + ENCRYPTED, + OPEN_FILE, + BAD_CATALOG, + DAMAGED; + public static GLib.Quark quark (); + } + [CCode (cheader_filename = "poppler.h", instance_pos = 1.9)] + public delegate bool AttachmentSaveFunc ([CCode (array_length_cname = "count", array_length_pos = 1.1, array_length_type = "gsize")] uint8[] buf) throws GLib.Error; + [CCode (cheader_filename = "poppler.h", instance_pos = 1.9)] + public delegate bool MediaSaveFunc ([CCode (array_length_cname = "count", array_length_pos = 1.1, array_length_type = "gsize")] uint8[] buf) throws GLib.Error; + [CCode (cheader_filename = "poppler.h", cname = "POPPLER_HAS_CAIRO")] public const int HAS_CAIRO; - [CCode (cheader_filename = "poppler.h")] + [CCode (cheader_filename = "poppler.h", cname = "POPPLER_MAJOR_VERSION")] public const int MAJOR_VERSION; - [CCode (cheader_filename = "poppler.h")] + [CCode (cheader_filename = "poppler.h", cname = "POPPLER_MICRO_VERSION")] public const int MICRO_VERSION; - [CCode (cheader_filename = "poppler.h")] + [CCode (cheader_filename = "poppler.h", cname = "POPPLER_MINOR_VERSION")] public const int MINOR_VERSION; [CCode (cheader_filename = "poppler.h")] - public const int WITH_GDK; - [CCode (cheader_filename = "poppler.h")] - public static bool date_parse (string date, ulong timet); - [CCode (cheader_filename = "poppler.h")] - public static GLib.Quark error_quark (); + public static bool date_parse (string date, long timet); [CCode (cheader_filename = "poppler.h")] public static Poppler.Backend get_backend (); [CCode (cheader_filename = "poppler.h")]