[poppler] 4 commits - glib/poppler.cc glib/poppler-structure-element.cc glib/reference
Carlos Garcia Campos
carlosgc at kemper.freedesktop.org
Thu Dec 3 02:01:37 PST 2015
glib/poppler-structure-element.cc | 11 +++++------
glib/poppler.cc | 15 +++++++++++++++
glib/reference/Makefile.am | 6 +++++-
glib/reference/poppler-docs.sgml | 1 +
glib/reference/poppler-sections.txt | 20 ++++++++++++++------
5 files changed, 40 insertions(+), 13 deletions(-)
New commits:
commit 50ba37c7b1aff14c73f158ff7f33d31953af512b
Author: Hib Eris <hib at hiberis.nl>
Date: Sun Jun 8 14:03:17 2014 +0200
doc: Move PopplerError to it's own section
https://bugs.freedesktop.org/show_bug.cgi?id=79837
diff --git a/glib/poppler.cc b/glib/poppler.cc
index 09ec9f4..abb634f 100644
--- a/glib/poppler.cc
+++ b/glib/poppler.cc
@@ -23,6 +23,21 @@
#include <Error.h>
#endif
+/**
+ * SECTION: poppler-errors
+ * @title: Error handling
+ * @short_description: Error domain and codes
+ *
+ */
+
+/**
+ * POPPLER_ERROR:
+ *
+ * Error domain for poppler operations. Errors in this domain will
+ * be from the #PopplerError enumeration. See #GError for information
+ * on error domains.
+ */
+
GQuark poppler_error_quark (void)
{
static GQuark q = 0;
diff --git a/glib/reference/poppler-docs.sgml b/glib/reference/poppler-docs.sgml
index 1bbcb5d..d847f52 100644
--- a/glib/reference/poppler-docs.sgml
+++ b/glib/reference/poppler-docs.sgml
@@ -25,6 +25,7 @@
<xi:include href="xml/poppler-movie.xml"/>
<xi:include href="xml/poppler-structure-element.xml"/>
<xi:include href="xml/poppler-color.xml"/>
+ <xi:include href="xml/poppler-errors.xml"/>
<xi:include href="xml/poppler-pdf-utility-functions.xml"/>
<xi:include href="xml/poppler-features.xml"/>
</chapter>
diff --git a/glib/reference/poppler-sections.txt b/glib/reference/poppler-sections.txt
index e0f06d5..bd02c41 100644
--- a/glib/reference/poppler-sections.txt
+++ b/glib/reference/poppler-sections.txt
@@ -342,17 +342,12 @@ poppler_form_text_type_get_type
<SECTION>
<FILE>poppler</FILE>
-POPPLER_ERROR
-PopplerError
PopplerOrientation
<SUBSECTION Standard>
-POPPLER_TYPE_ERROR
POPPLER_TYPE_ORIENTATION
<SUBSECTION Private>
-poppler_error_get_type
-poppler_error_quark
poppler_orientation_get_type
</SECTION>
@@ -752,3 +747,16 @@ POPPLER_TYPE_BACKEND
<SUBSECTION Private>
poppler_backend_get_type
</SECTION>
+
+<SECTION>
+<FILE>poppler-errors</FILE>
+POPPLER_ERROR
+PopplerError
+
+<SUBSECTION Standard>
+POPPLER_TYPE_ERROR
+
+<SUBSECTION Private>
+poppler_error_get_type
+poppler_error_quark
+</SECTION>
commit ef518d601836fcedb8b558447f10c846e4038318
Author: Hib Eris <hib at hiberis.nl>
Date: Mon Jun 9 15:53:57 2014 +0200
doc: Add poppler_orientation_get_type to poppler-sections.txt
https://bugs.freedesktop.org/show_bug.cgi?id=79837
diff --git a/glib/reference/poppler-sections.txt b/glib/reference/poppler-sections.txt
index 2f74791..e0f06d5 100644
--- a/glib/reference/poppler-sections.txt
+++ b/glib/reference/poppler-sections.txt
@@ -353,6 +353,7 @@ POPPLER_TYPE_ORIENTATION
<SUBSECTION Private>
poppler_error_get_type
poppler_error_quark
+poppler_orientation_get_type
</SECTION>
<SECTION>
commit 7f1de12da6d1128535c2e3e7dc89e29ca61b858f
Author: Hib Eris <hib at hiberis.nl>
Date: Sun Jun 8 22:27:47 2014 +0200
doc: Fix PopplerStructureElement documentation
https://bugs.freedesktop.org/show_bug.cgi?id=79837
diff --git a/glib/poppler-structure-element.cc b/glib/poppler-structure-element.cc
index fdde41e..c626999 100644
--- a/glib/poppler-structure-element.cc
+++ b/glib/poppler-structure-element.cc
@@ -36,12 +36,11 @@
* SECTION:poppler-structure-element
* @short_description: Document structure element.
* @title: PopplerStructureElement
- * @see_also: #PopplerStructure
*
* Instances of #PopplerStructureElement are used to describe the structure
* of a #PopplerDocument. To access the elements in the structure of the
* document, use poppler_structure_element_iter_new() to obtain an iterator
- * for the top-level #PopplerStructure, and then use the
+ * for the top-level #PopplerStructureElement, and then use the
* #PopplerStructureElementIter methods to traverse the structure tree.
*/
@@ -1816,7 +1815,7 @@ poppler_structure_element_get_text_decoration_color (PopplerStructureElement *po
* If this attribute is not specified, it shall be derived from the current
* stroke thickness in effect at the start of the element’s associated content.
*
- * Return value: Thickness of the text decoration, or %NaN if not defined.
+ * Return value: Thickness of the text decoration, or NAN if not defined.
*
* Since: 0.26
*/
@@ -1935,10 +1934,10 @@ poppler_structure_element_get_column_count (PopplerStructureElement *poppler_str
* array of elements: the first one is the size of the gap in between
* columns 1 and 2, second is the size between columns 2 and 3, and so on.
*
- * For elements which use a single column, %NULL is returned and %n_values
+ * For elements which use a single column, %NULL is returned and @n_values
* is set to zero.
*
- * If the attribute is undefined, %NULL is returned and %n_values is set
+ * If the attribute is undefined, %NULL is returned and @n_values is set
* to a non-zero value.
*
* The array with the results is allocated by the function. When it is
@@ -2197,7 +2196,7 @@ poppler_structure_element_get_table_headers (PopplerStructureElement *poppler_st
*
* Obtains the scope of a table structure element.
*
- * Return value: A #PopplerStructureScope value.
+ * Return value: A #PopplerStructureTableScope value.
*
* Since: 0.26
*/
commit d4a9da24d2c479d53ff1094e6e1d7c1d79561da4
Author: Hib Eris <hib at hiberis.nl>
Date: Mon Jun 9 08:34:13 2014 +0200
doc: Do not include private headers
https://bugs.freedesktop.org/show_bug.cgi?id=79837
diff --git a/glib/reference/Makefile.am b/glib/reference/Makefile.am
index 3f772df..a861762 100644
--- a/glib/reference/Makefile.am
+++ b/glib/reference/Makefile.am
@@ -47,7 +47,11 @@ CFILE_GLOB=$(top_srcdir)/glib/*.cc
# Header files to ignore when scanning.
# e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h
-IGNORE_HFILES=demo
+IGNORE_HFILES= \
+ poppler-private.h \
+ poppler-input-stream.h \
+ poppler-cached-file-loader.h \
+ demo
# Images to copy into HTML directory.
# e.g. HTML_IMAGES=$(top_srcdir)/gtk/stock-icons/stock_about_24.png
diff --git a/glib/reference/poppler-sections.txt b/glib/reference/poppler-sections.txt
index bbac42d..2f74791 100644
--- a/glib/reference/poppler-sections.txt
+++ b/glib/reference/poppler-sections.txt
@@ -351,7 +351,6 @@ POPPLER_TYPE_ERROR
POPPLER_TYPE_ORIENTATION
<SUBSECTION Private>
-POPPLER_DEFINE_BOXED_TYPE
poppler_error_get_type
poppler_error_quark
</SECTION>
More information about the poppler
mailing list