[poppler] 2 commits - glib/poppler-attachment.cc glib/poppler-document.cc glib/poppler-features.h.in glib/poppler-media.cc glib/poppler-page.cc
Carlos Garcia Campos
carlosgc at kemper.freedesktop.org
Mon Jul 5 02:17:21 PDT 2010
glib/poppler-attachment.cc | 4 ++--
glib/poppler-document.cc | 12 ++++++------
glib/poppler-features.h.in | 6 ++++--
glib/poppler-media.cc | 4 ++--
glib/poppler-page.cc | 4 ++--
5 files changed, 16 insertions(+), 14 deletions(-)
New commits:
commit 092aa901b9ec35a48bc1fb229ad16a3b00eef5f2
Author: Carlos Garcia Campos <carlosgc at gnome.org>
Date: Mon Jul 5 11:16:49 2010 +0200
[glib] docs: add some more introspection annotations
diff --git a/glib/poppler-attachment.cc b/glib/poppler-attachment.cc
index 6ff20b2..d3281ba 100644
--- a/glib/poppler-attachment.cc
+++ b/glib/poppler-attachment.cc
@@ -157,7 +157,7 @@ save_helper (const gchar *buf,
* poppler_attachment_save:
* @attachment: A #PopplerAttachment.
* @filename: name of file to save
- * @error: return location for error, or %NULL.
+ * @error: (allow-none): return location for error, or %NULL.
*
* Saves @attachment to a file indicated by @filename. If @error is set, %FALSE
* will be returned. Possible errors include those in the #G_FILE_ERROR domain
@@ -215,7 +215,7 @@ poppler_attachment_save (PopplerAttachment *attachment,
* @attachment: A #PopplerAttachment.
* @save_func: 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: return location for error, or %NULL.
+ * @error: (allow-none): return location for error, or %NULL.
*
* Saves @attachment by feeding the produced data to @save_func. Can be used
* when you want to store the attachment to something other than a file, such as
diff --git a/glib/poppler-document.cc b/glib/poppler-document.cc
index c013e25..288bf11 100644
--- a/glib/poppler-document.cc
+++ b/glib/poppler-document.cc
@@ -133,8 +133,8 @@ _poppler_document_new_from_pdfdoc (PDFDoc *newDoc,
/**
* poppler_document_new_from_file:
* @uri: uri of the file to load
- * @password: password to unlock the file with, or %NULL
- * @error: Return location for an error, or %NULL
+ * @password: (allow-none): password to unlock the file with, or %NULL
+ * @error: (allow-none): Return location for an error, or %NULL
*
* Creates a new #PopplerDocument. If %NULL is returned, then @error will be
* set. Possible errors include those in the #POPPLER_ERROR and #G_FILE_ERROR
@@ -205,8 +205,8 @@ poppler_document_new_from_file (const char *uri,
* poppler_document_new_from_data:
* @data: the pdf data contained in a char array
* @length: the length of #data
- * @password: password to unlock the file with, or %NULL
- * @error: Return location for an error, or %NULL
+ * @password: (allow-none): password to unlock the file with, or %NULL
+ * @error: (allow-none): Return location for an error, or %NULL
*
* Creates a new #PopplerDocument. If %NULL is returned, then @error will be
* set. Possible errors include those in the #POPPLER_ERROR and #G_FILE_ERROR
@@ -274,7 +274,7 @@ handle_save_error (int err_code,
* poppler_document_save:
* @document: a #PopplerDocument
* @uri: uri of file to save
- * @error: return location for an error, or %NULL
+ * @error: (allow-none): return location for an error, or %NULL
*
* Saves @document. Any change made in the document such as
* form fields filled by the user will be saved.
@@ -311,7 +311,7 @@ poppler_document_save (PopplerDocument *document,
* poppler_document_save_a_copy:
* @document: a #PopplerDocument
* @uri: uri of file to save
- * @error: return location for an error, or %NULL
+ * @error: (allow-none): return location for an error, or %NULL
*
* Saves a copy of the original @document.
* Any change made in the document such as
diff --git a/glib/poppler-media.cc b/glib/poppler-media.cc
index ab2270a..a909dde 100644
--- a/glib/poppler-media.cc
+++ b/glib/poppler-media.cc
@@ -195,7 +195,7 @@ save_helper (const gchar *buf,
* poppler_media_save:
* @poppler_media: a #PopplerMedia
* @filename: name of file to save
- * @error: return location for error, or %NULL.
+ * @error: (allow-none): return location for error, or %NULL.
*
* Saves embedded stream of @poppler_media to a file indicated by @filename.
* If @error is set, %FALSE will be returned.
@@ -257,7 +257,7 @@ poppler_media_save (PopplerMedia *poppler_media,
* @poppler_media: a #PopplerMedia
* @save_func: 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: return location for error, or %NULL.
+ * @error: (allow-none): return location for error, or %NULL.
*
* Saves embedded stream of @poppler_media by feeding the produced data to @save_func. Can be used
* when you want to store the media clip stream to something other than a file, such as
diff --git a/glib/poppler-page.cc b/glib/poppler-page.cc
index b96a755..031edc7 100644
--- a/glib/poppler-page.cc
+++ b/glib/poppler-page.cc
@@ -84,8 +84,8 @@ poppler_page_finalize (GObject *object)
/**
* poppler_page_get_size:
* @page: A #PopplerPage
- * @width: return location for the width of @page
- * @height: return location for the height of @page
+ * @width: (allow-none): return location for the width of @page
+ * @height: (allow-none): return location for the height of @page
*
* Gets the size of @page at the current scale and rotation.
**/
commit 6c4e14fd90d5ef2d6670a980ab2476b6fab58df7
Author: Carlos Garcia Campos <carlosgc at gnome.org>
Date: Mon Jul 5 10:49:59 2010 +0200
[glib] docs: fix POPPLER_CHECK_VERSION() docs
diff --git a/glib/poppler-features.h.in b/glib/poppler-features.h.in
index 6ac0971..4cd37cd 100644
--- a/glib/poppler-features.h.in
+++ b/glib/poppler-features.h.in
@@ -79,8 +79,10 @@
* @minor: minor version (e.g. 1 for version 0.1.2)
* @micro: micro version (e.g. 2 for version 0.1.2)
*
- * Returns %TRUE if the version of the poppler header files is the same
- * as or newer than the passed-in version.
+ * Checks the version fo the poppler library
+ *
+ * Returns: %TRUE if the version of the poppler header files is the same
+ * as or newer than the passed-in version
*
* Since: 0.12
*/
More information about the poppler
mailing list