[poppler] Branch 'poppler-0.16' - glib/poppler-attachment.cc glib/poppler-document.cc glib/poppler-media.cc glib/poppler-page.cc

[Carlos Garcia Campos]

 glib/poppler-attachment.cc |    2 +-
 glib/poppler-document.cc   |    4 ++--
 glib/poppler-media.cc      |    2 +-
 glib/poppler-page.cc       |    6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 3c96d19dd3e2f4652f070089c777720cced2c371
Author: Carlos Garcia Campos <carlosgc at gnome.org>
Date:   Sat Feb 26 11:59:03 2011 +0100

    glib: Add some more introspection annotations

diff --git a/glib/poppler-attachment.cc b/glib/poppler-attachment.cc
index d3281ba..1218b9b 100644
--- a/glib/poppler-attachment.cc
+++ b/glib/poppler-attachment.cc
@@ -213,7 +213,7 @@ poppler_attachment_save (PopplerAttachment  *attachment,
 /**
  * poppler_attachment_save_to_callback:
  * @attachment: A #PopplerAttachment.
- * @save_func: a function that is called to save each block of data that the save routine generates.
+ * @save_func: (scope call): a function that is called to save each block of data that the save routine generates.
  * @user_data: user data to pass to the save function.
  * @error: (allow-none): return location for error, or %NULL.
  * 
diff --git a/glib/poppler-document.cc b/glib/poppler-document.cc
index 31d1566..fd764d8 100644
--- a/glib/poppler-document.cc
+++ b/glib/poppler-document.cc
@@ -715,8 +715,8 @@ poppler_document_get_pdf_version_string (PopplerDocument *document)
 /**
  * poppler_document_get_pdf_version:
  * @document: A #PopplerDocument
- * @major_version: (allow-none): return location for the PDF major version number
- * @minor_version: (allow-none): return location for the PDF minor version number
+ * @major_version: (out) (allow-none): return location for the PDF major version number
+ * @minor_version: (out) (allow-none): return location for the PDF minor version number
  *
  * Returns the major and minor PDF version numbers.
  *
diff --git a/glib/poppler-media.cc b/glib/poppler-media.cc
index a909dde..4c31b84 100644
--- a/glib/poppler-media.cc
+++ b/glib/poppler-media.cc
@@ -255,7 +255,7 @@ poppler_media_save (PopplerMedia *poppler_media,
 /**
  * poppler_media_save_to_callback:
  * @poppler_media: a #PopplerMedia
- * @save_func: a function that is called to save each block of data that the save routine generates.
+ * @save_func: (scope call): a function that is called to save each block of data that the save routine generates.
  * @user_data: user data to pass to the save function.
  * @error: (allow-none): return location for error, or %NULL.
  *
diff --git a/glib/poppler-page.cc b/glib/poppler-page.cc
index 7c3a31f..3c0edaf 100644
--- a/glib/poppler-page.cc
+++ b/glib/poppler-page.cc
@@ -871,8 +871,8 @@ poppler_page_render_selection_to_pixbuf (PopplerPage           *page,
 /**
  * poppler_page_get_thumbnail_size:
  * @page: A #PopplerPage
- * @width: return location for width
- * @height: return location for height
+ * @width: (out) return location for width
+ * @height: (out) return location for height
  *
  * Returns %TRUE if @page has a thumbnail associated with it.  It also
  * fills in @width and @height with the width and height of the
@@ -2111,7 +2111,7 @@ poppler_page_get_crop_box (PopplerPage *page, PopplerRectangle *rect)
  * poppler_page_get_text_layout:
  * @page: A #PopplerPage
  * @rectangles: (out) (array length=n_rectangles) (transfer container): return location for an array of #PopplerRectangle
- * @n_rectangles: length of returned array
+ * @n_rectangles: (out) length of returned array
  *
  * Obtains the layout of the text as a list of #PopplerRectangle
  * This array must be freed with g_free () when done.