[poppler] 8 commits - glib/poppler-annot.cc glib/poppler-annot.h glib/poppler-document.cc glib/poppler-document.h glib/poppler-media.cc glib/poppler-page.cc glib/poppler-page.h glib/reference gtk-doc.make m4/gtk-doc.m4
Carlos Garcia Campos
carlosgc at kemper.freedesktop.org
Sat Feb 4 03:04:33 PST 2012
glib/poppler-annot.cc | 6 -
glib/poppler-annot.h | 2
glib/poppler-document.cc | 9 +-
glib/poppler-document.h | 26 ++++----
glib/poppler-media.cc | 2
glib/poppler-page.cc | 13 +---
glib/poppler-page.h | 4 -
glib/reference/Makefile.am | 12 +--
glib/reference/poppler-sections.txt | 8 --
gtk-doc.make | 112 ++++++++++++++++++++----------------
m4/gtk-doc.m4 | 6 +
11 files changed, 108 insertions(+), 92 deletions(-)
New commits:
commit 88cb6d9360bc943fc2cdda262dc46bf831641541
Author: Carlos Garcia Campos <carlosgc at gnome.org>
Date: Sat Feb 4 12:04:03 2012 +0100
glib: Update gtk-doc makefile and m4 file
diff --git a/gtk-doc.make b/gtk-doc.make
index 4450835..9841de4 100644
--- a/gtk-doc.make
+++ b/gtk-doc.make
@@ -5,12 +5,12 @@
####################################
if GTK_DOC_USE_LIBTOOL
-GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
+GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(GTKDOC_DEPS_LIBS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
GTKDOC_RUN = $(LIBTOOL) --mode=execute
else
-GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
+GTKDOC_CC = $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+GTKDOC_LD = $(CC) $(GTKDOC_DEPS_LIBS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
GTKDOC_RUN =
endif
@@ -30,11 +30,12 @@ SETUP_FILES = \
$(DOC_MODULE)-overrides.txt
EXTRA_DIST = \
+ $(HTML_IMAGES) \
$(SETUP_FILES)
DOC_STAMPS=setup-build.stamp scan-build.stamp sgml-build.stamp \
html-build.stamp pdf-build.stamp \
- setup.stamp sgml.stamp html.stamp pdf.stamp
+ sgml.stamp html.stamp pdf.stamp
SCANOBJ_FILES = \
$(DOC_MODULE).args \
@@ -75,36 +76,41 @@ $(REPORT_FILES): sgml-build.stamp
setup-build.stamp:
- at if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
- echo 'gtk-doc: Preparing build'; \
- files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \
- if test "x$$files" != "x" ; then \
- for file in $$files ; do \
- test -f $(abs_srcdir)/$$file && \
- cp -p $(abs_srcdir)/$$file $(abs_builddir)/; \
- done \
- fi \
+ echo ' DOC Preparing build'; \
+ files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \
+ if test "x$$files" != "x" ; then \
+ for file in $$files ; do \
+ test -f $(abs_srcdir)/$$file && \
+ cp -pu $(abs_srcdir)/$$file $(abs_builddir)/ || true; \
+ done; \
+ fi; \
fi
@touch setup-build.stamp
-setup.stamp: setup-build.stamp
- @true
-
-
#### scan ####
scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
- @echo 'gtk-doc: Scanning header files'
+ @echo ' DOC Scanning header files'
@_source_dir='' ; \
for i in $(DOC_SOURCE_DIR) ; do \
_source_dir="$${_source_dir} --source-dir=$$i" ; \
done ; \
gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES)
@if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \
- CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) ; \
+ echo " DOC Introspecting gobjects"; \
+ scanobj_options=""; \
+ gtkdoc-scangobj 2>&1 --help | grep >/dev/null "\-\-verbose"; \
+ if test "$(?)" = "0"; then \
+ if test "x$(V)" = "x1"; then \
+ scanobj_options="--verbose"; \
+ fi; \
+ fi; \
+ CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" \
+ gtkdoc-scangobj $(SCANGOBJ_OPTIONS) $$scanobj_options --module=$(DOC_MODULE); \
else \
for i in $(SCANOBJ_FILES) ; do \
- test -f $$i || touch $$i ; \
+ test -f $$i || touch $$i ; \
done \
fi
@touch scan-build.stamp
@@ -114,8 +120,8 @@ $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)
#### xml ####
-sgml-build.stamp: setup.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files)
- @echo 'gtk-doc: Building XML'
+sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files)
+ @echo ' DOC Building XML'
@_source_dir='' ; \
for i in $(DOC_SOURCE_DIR) ; do \
_source_dir="$${_source_dir} --source-dir=$$i" ; \
@@ -129,13 +135,19 @@ sgml.stamp: sgml-build.stamp
#### html ####
html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
- @echo 'gtk-doc: Building HTML'
+ @echo ' DOC Building HTML'
@rm -rf html
@mkdir html
@mkhtml_options=""; \
+ gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-verbose"; \
+ if test "$(?)" = "0"; then \
+ if test "x$(V)" = "x1"; then \
+ mkhtml_options="$$mkhtml_options --verbose"; \
+ fi; \
+ fi; \
gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \
if test "$(?)" = "0"; then \
- mkhtml_options=--path="$(abs_srcdir)"; \
+ mkhtml_options="$$mkhtml_options --path=\"$(abs_srcdir)\""; \
fi; \
cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
- at test "x$(HTML_IMAGES)" = "x" || \
@@ -147,48 +159,54 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
cp $(abs_builddir)/$$file $(abs_builddir)/html; \
fi; \
done;
- @echo 'gtk-doc: Fixing cross-references'
+ @echo ' DOC Fixing cross-references'
@gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
@touch html-build.stamp
#### pdf ####
pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
- @echo 'gtk-doc: Building PDF'
- @rm -rf $(DOC_MODULE).pdf
- @mkpdf_imgdirs=""; \
+ @echo ' DOC Building PDF'
+ @rm -f $(DOC_MODULE).pdf
+ @mkpdf_options=""; \
+ gtkdoc-mkpdf 2>&1 --help | grep >/dev/null "\-\-verbose"; \
+ if test "$(?)" = "0"; then \
+ if test "x$(V)" = "x1"; then \
+ mkpdf_options="$$mkpdf_options --verbose"; \
+ fi; \
+ fi; \
if test "x$(HTML_IMAGES)" != "x"; then \
for img in $(HTML_IMAGES); do \
part=`dirname $$img`; \
- echo $$mkpdf_imgdirs | grep >/dev/null "\-\-imgdir=$$part "; \
+ echo $$mkpdf_options | grep >/dev/null "\-\-imgdir=$$part "; \
if test $$? != 0; then \
- mkpdf_imgdirs="$$mkpdf_imgdirs --imgdir=$$part"; \
+ mkpdf_options="$$mkpdf_options --imgdir=$$part"; \
fi; \
done; \
fi; \
- gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_imgdirs $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS)
+ gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_options $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS)
@touch pdf-build.stamp
##############
clean-local:
- rm -f *~ *.bak
- rm -rf .libs
+ @rm -f *~ *.bak
+ @rm -rf .libs
distclean-local:
- rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \
+ @rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \
$(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
- if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
+ @if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
rm -f $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types; \
fi
maintainer-clean-local: clean
- rm -rf xml html
+ @rm -rf xml html
install-data-local:
@installfiles=`echo $(builddir)/html/*`; \
- if test "$$installfiles" = '$(srcdir)/html/*'; \
- then echo '-- Nothing to install' ; \
+ if test "$$installfiles" = '$(builddir)/html/*'; \
+ then echo 1>&2 'Nothing to install' ; \
else \
if test -n "$(DOC_MODULE_VERSION)"; then \
installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \
@@ -197,14 +215,12 @@ install-data-local:
fi; \
$(mkinstalldirs) $${installdir} ; \
for i in $$installfiles; do \
- echo '-- Installing '$$i ; \
+ echo ' $(INSTALL_DATA) '$$i ; \
$(INSTALL_DATA) $$i $${installdir}; \
done; \
if test -n "$(DOC_MODULE_VERSION)"; then \
mv -f $${installdir}/$(DOC_MODULE).devhelp2 \
$${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp2; \
- mv -f $${installdir}/$(DOC_MODULE).devhelp \
- $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \
fi; \
$(GTKDOC_REBASE) --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir}; \
fi
@@ -229,12 +245,12 @@ dist-check-gtkdoc:
endif
dist-hook: dist-check-gtkdoc dist-hook-local
- mkdir $(distdir)/html
- cp $(builddir)/html/* $(distdir)/html
- -cp $(builddir)/$(DOC_MODULE).pdf $(distdir)/
- -cp $(builddir)/$(DOC_MODULE).types $(distdir)/
- -cp $(builddir)/$(DOC_MODULE)-sections.txt $(distdir)/
- cd $(distdir) && rm -f $(DISTCLEANFILES)
- $(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html
+ @mkdir $(distdir)/html
+ @cp ./html/* $(distdir)/html
+ @-cp ./$(DOC_MODULE).pdf $(distdir)/
+ @-cp ./$(DOC_MODULE).types $(distdir)/
+ @-cp ./$(DOC_MODULE)-sections.txt $(distdir)/
+ @cd $(distdir) && rm -f $(DISTCLEANFILES)
+ @$(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html
.PHONY : dist-hook-local docs
diff --git a/m4/gtk-doc.m4 b/m4/gtk-doc.m4
index 2cfa1e7..0ada151 100644
--- a/m4/gtk-doc.m4
+++ b/m4/gtk-doc.m4
@@ -6,6 +6,7 @@ dnl Usage:
dnl GTK_DOC_CHECK([minimum-gtk-doc-version])
AC_DEFUN([GTK_DOC_CHECK],
[
+ AC_REQUIRE([PKG_PROG_PKG_CONFIG])
AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
@@ -33,6 +34,11 @@ AC_DEFUN([GTK_DOC_CHECK],
AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))],
[PKG_CHECK_EXISTS([gtk-doc >= $1],,
AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build $PACKAGE_NAME]))])
+ dnl don't check for glib if we build glib
+ if test "x$PACKAGE_NAME" != "xglib"; then
+ dnl don't fail if someone does not have glib
+ PKG_CHECK_MODULES(GTKDOC_DEPS, glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0,,)
+ fi
fi
AC_MSG_CHECKING([whether to build gtk-doc documentation])
commit 3f4164f84bbf748a2f919741669ef20db0fbda9f
Author: Hib Eris <hib at hiberis.nl>
Date: Wed Feb 1 10:44:17 2012 +0100
gtk-doc: Fix build when builddir != srcdir
Bug #45549.
diff --git a/glib/reference/Makefile.am b/glib/reference/Makefile.am
index 70e6c92..b01192d 100644
--- a/glib/reference/Makefile.am
+++ b/glib/reference/Makefile.am
@@ -14,11 +14,11 @@ DOC_MODULE=poppler
# The top-level SGML file. You can change this if you want to.
DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml
-# The directory containing the source code. Relative to $(srcdir).
-# gtk-doc will search all .c & .h files beneath here for inline comments
-# documenting the functions and macros.
-# e.g. DOC_SOURCE_DIR=../../../gtk
-DOC_SOURCE_DIR=..
+# Directories containing the source code.
+# gtk-doc will search all .c and .h files beneath these paths
+# for inline comments documenting functions and macros.
+# e.g. DOC_SOURCE_DIR=$(top_srcdir)/gtk $(top_srcdir)/gdk
+DOC_SOURCE_DIR=$(top_builddir)/glib $(top_srcdir)/glib
# Extra options to pass to gtkdoc-scangobj. Not normally needed.
SCANGOBJ_OPTIONS=
commit 8daeb82f982eba25fe8c7d07358f0a6593ddc89a
Author: Hib Eris <hib at hiberis.nl>
Date: Thu Feb 2 13:01:45 2012 +0100
gtk-doc: Fix API documentation for poppler_page_free_annot_mapping()
Remove reference to non existent method poppler_annot_free() and use
ref/unref instead of copy/free.
Bug #45549.
diff --git a/glib/poppler-page.cc b/glib/poppler-page.cc
index e9ef3a2..910ae26 100644
--- a/glib/poppler-page.cc
+++ b/glib/poppler-page.cc
@@ -1402,9 +1402,9 @@ poppler_page_get_annot_mapping (PopplerPage *page)
* #PopplerAnnotMapping<!-- -->s
*
* Frees a list of #PopplerAnnotMapping<!-- -->s allocated by
- * poppler_page_get_annot_mapping(). It also frees the #PopplerAnnot<!-- -->s
+ * poppler_page_get_annot_mapping(). It also unreferences the #PopplerAnnot<!-- -->s
* that each mapping contains, so if you want to keep them around, you need to
- * copy them with poppler_annot_copy().
+ * reference them with g_object_ref().
**/
void
poppler_page_free_annot_mapping (GList *list)
commit f8ce9966e4f480949799a26c01bd861f4011b587
Author: Carlos Garcia Campos <carlosgc at gnome.org>
Date: Sat Feb 4 11:51:34 2012 +0100
gtk-doc: Remove reference to non existent method poppler_layer_free()
Bug #45549.
diff --git a/glib/poppler-document.cc b/glib/poppler-document.cc
index 2d3ba1e..56a748f 100644
--- a/glib/poppler-document.cc
+++ b/glib/poppler-document.cc
@@ -2320,10 +2320,9 @@ poppler_layers_iter_get_title (PopplerLayersIter *iter)
/**
* poppler_layers_iter_get_layer:
* @iter: a #PopplerLayersIter
- *
- * Returns the #PopplerLayer associated with @iter. It must be freed with
- * poppler_layer_free().
- *
+ *
+ * Returns the #PopplerLayer associated with @iter.
+ *
* Return value: (transfer full): a new #PopplerLayer, or %NULL if
* there isn't any layer associated with @iter
*
commit f58f3525f135bc47e89c23c33e96e43db10d4853
Author: Hib Eris <hib at hiberis.nl>
Date: Thu Feb 2 15:59:47 2012 +0100
gtk-doc: Add more glib API documentation for poppler-document
Fixes several gtk-doc warnings.
Bug #45549.
diff --git a/glib/poppler-document.h b/glib/poppler-document.h
index 69d0871..4ab17c8 100644
--- a/glib/poppler-document.h
+++ b/glib/poppler-document.h
@@ -77,17 +77,17 @@ typedef enum
/**
* PopplerFontType:
* @POPPLER_FONT_TYPE_UNKNOWN: unknown font type
- * @POPPLER_FONT_TYPE_TYPE1:
- * @POPPLER_FONT_TYPE_TYPE1C:
- * @POPPLER_FONT_TYPE_TYPE1COT:
- * @POPPLER_FONT_TYPE_TYPE3:
- * @POPPLER_FONT_TYPE_TRUETYPE:
- * @POPPLER_FONT_TYPE_TRUETYPEOT:
- * @POPPLER_FONT_TYPE_CID_TYPE0:
- * @POPPLER_FONT_TYPE_CID_TYPE0C:
- * @POPPLER_FONT_TYPE_CID_TYPE0COT:
- * @POPPLER_FONT_TYPE_CID_TYPE2:
- * @POPPLER_FONT_TYPE_CID_TYPE2OT:
+ * @POPPLER_FONT_TYPE_TYPE1: Type 1 font type
+ * @POPPLER_FONT_TYPE_TYPE1C: Type 1 font type embedded in Compact Font Format (CFF) font program
+ * @POPPLER_FONT_TYPE_TYPE1COT: Type 1 font type embedded in OpenType font program
+ * @POPPLER_FONT_TYPE_TYPE3: A font type that is defined with PDF graphics operators
+ * @POPPLER_FONT_TYPE_TRUETYPE: TrueType font type
+ * @POPPLER_FONT_TYPE_TRUETYPEOT: TrueType font type embedded in OpenType font program
+ * @POPPLER_FONT_TYPE_CID_TYPE0: CIDFont type based on Type 1 font technology
+ * @POPPLER_FONT_TYPE_CID_TYPE0C: CIDFont type based on Type 1 font technology embedded in CFF font program
+ * @POPPLER_FONT_TYPE_CID_TYPE0COT: CIDFont type based on Type 1 font technology embedded in OpenType font program
+ * @POPPLER_FONT_TYPE_CID_TYPE2: CIDFont type based on TrueType font technology
+ * @POPPLER_FONT_TYPE_CID_TYPE2OT: CIDFont type based on TrueType font technology embedded in OpenType font program
*
* Font types
*/
@@ -116,7 +116,7 @@ typedef enum
* @POPPLER_VIEWER_PREFERENCES_FIT_WINDOW: resize document's window to fit the size of the first displayed page
* @POPPLER_VIEWER_PREFERENCES_CENTER_WINDOW: position the document's window in the center of the screen
* @POPPLER_VIEWER_PREFERENCES_DISPLAY_DOC_TITLE: display document title in window's title bar
- * @POPPLER_VIEWER_PREFERENCES_DIRECTION_RTL:
+ * @POPPLER_VIEWER_PREFERENCES_DIRECTION_RTL: the predominant reading order for text is right to left
*
* Viewer preferences
*/
@@ -144,7 +144,7 @@ typedef enum /*< flags >*/
* @POPPLER_PERMISSIONS_OK_TO_ASSEMBLE: assemble the document (insert, rotate, or delete pages and create
* bookmarks or thumbnail images). Since 0.18
* @POPPLER_PERMISSIONS_OK_TO_PRINT_HIGH_RESOLUTION: document can be printer at high resolution. Since 0.18
- * @POPPLER_PERMISSIONS_FULL:
+ * @POPPLER_PERMISSIONS_FULL: document permits all operations
*
* Permissions
*/
commit 080247f6a47bc929b25f6e000f4474801af74b1f
Author: Hib Eris <hib at hiberis.nl>
Date: Thu Feb 2 15:45:37 2012 +0100
gtk-doc: remove references to removed pixbuf functions
Bug #45549.
diff --git a/glib/poppler-page.cc b/glib/poppler-page.cc
index fe47af7..e9ef3a2 100644
--- a/glib/poppler-page.cc
+++ b/glib/poppler-page.cc
@@ -624,8 +624,7 @@ poppler_page_get_thumbnail_size (PopplerPage *page,
* @selection: start and end point of selection as a rectangle
*
* Returns a region containing the area that would be rendered by
- * poppler_page_render_selection() or
- * poppler_page_render_selection_to_pixbuf() as a #GList of
+ * poppler_page_render_selection() as a #GList of
* #PopplerRectangle. The returned list must be freed with
* poppler_page_selection_region_free().
*
@@ -716,8 +715,7 @@ poppler_page_selection_region_free (GList *region)
* @selection: start and end point of selection as a rectangle
*
* Returns a region containing the area that would be rendered by
- * poppler_page_render_selection() or
- * poppler_page_render_selection_to_pixbuf().
+ * poppler_page_render_selection().
* The returned region must be freed with cairo_region_destroy()
*
* Return value: (transfer full): a cairo_region_t
diff --git a/glib/reference/poppler-sections.txt b/glib/reference/poppler-sections.txt
index c3d9a3f..c2759b8 100644
--- a/glib/reference/poppler-sections.txt
+++ b/glib/reference/poppler-sections.txt
@@ -23,15 +23,11 @@ poppler_page_get_duration
poppler_page_get_transition
poppler_page_get_thumbnail_size
poppler_page_get_thumbnail
-poppler_page_get_thumbnail_pixbuf
poppler_page_render
poppler_page_render_for_printing
poppler_page_render_for_printing_with_options
-poppler_page_render_to_pixbuf
-poppler_page_render_to_pixbuf_for_printing
poppler_page_render_to_ps
poppler_page_render_selection
-poppler_page_render_selection_to_pixbuf
poppler_page_get_selected_region
poppler_page_get_selection_region
poppler_page_selection_region_free
commit 47780d9ed1fd69068fdb9b9782e2cb37e2a5b217
Author: Hib Eris <hib at hiberis.nl>
Date: Thu Feb 2 15:43:30 2012 +0100
gtk-doc: do not build doc for glib-demo
Fixes glib-demo symbols in poppler-unused.txt
Bug #45549.
diff --git a/glib/reference/Makefile.am b/glib/reference/Makefile.am
index f9064b0..70e6c92 100644
--- a/glib/reference/Makefile.am
+++ b/glib/reference/Makefile.am
@@ -47,7 +47,7 @@ CFILE_GLOB=$(top_srcdir)/glib/*.cc
# Header files to ignore when scanning.
# e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h
-IGNORE_HFILES=
+IGNORE_HFILES=demo
# Images to copy into HTML directory.
# e.g. HTML_IMAGES=$(top_srcdir)/gtk/stock-icons/stock_about_24.png
commit e320f335cc6e54c60bd2436799dd1f05beb060ba
Author: Hib Eris <hib at hiberis.nl>
Date: Sat Feb 4 11:32:50 2012 +0100
gtk-doc: Fix typo's
Bug #45549.
diff --git a/glib/poppler-annot.cc b/glib/poppler-annot.cc
index 588ede3..834c0c6 100644
--- a/glib/poppler-annot.cc
+++ b/glib/poppler-annot.cc
@@ -1164,10 +1164,10 @@ poppler_annot_free_text_get_quadding (PopplerAnnotFreeText *poppler_annot)
* poppler_annot_free_text_get_callout_line:
* @poppler_annot: a #PopplerAnnotFreeText
*
- * Retrieves a #PopplerCalloutLine of four or six numbers specifying a callout
+ * Retrieves a #PopplerAnnotCalloutLine of four or six numbers specifying a callout
* line attached to the @poppler_annot.
*
- * Return value: a new allocated #PopplerCalloutLine if the annot has a callout
+ * Return value: a new allocated #PopplerAnnotCalloutLine if the annot has a callout
* line, %NULL in other case. It must be freed with g_free() when
* done.
**/
@@ -1278,7 +1278,7 @@ poppler_annot_callout_line_new (void)
/**
* poppler_annot_callout_line_copy:
- * @callout: the #PopplerAnnotCalloutline to be copied.
+ * @callout: the #PopplerAnnotCalloutLine to be copied.
*
* It does copy @callout to a new #PopplerAnnotCalloutLine.
*
diff --git a/glib/poppler-annot.h b/glib/poppler-annot.h
index 99cbb74..17440fb 100644
--- a/glib/poppler-annot.h
+++ b/glib/poppler-annot.h
@@ -219,7 +219,7 @@ PopplerMovie *poppler_annot_movie_get_movie (
GType poppler_annot_screen_get_type (void) G_GNUC_CONST;
PopplerAction *poppler_annot_screen_get_action (PopplerAnnotScreen *poppler_annot);
-/* PopplerCalloutLine */
+/* PopplerAnnotCalloutLine */
GType poppler_annot_callout_line_get_type (void) G_GNUC_CONST;
PopplerAnnotCalloutLine *poppler_annot_callout_line_new (void);
PopplerAnnotCalloutLine *poppler_annot_callout_line_copy (PopplerAnnotCalloutLine *callout);
diff --git a/glib/poppler-document.cc b/glib/poppler-document.cc
index 7faca19..2d3ba1e 100644
--- a/glib/poppler-document.cc
+++ b/glib/poppler-document.cc
@@ -734,7 +734,7 @@ poppler_document_get_pdf_version_string (PopplerDocument *document)
* @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.
+ * Returns: the major and minor PDF version numbers
*
* Since: 0.16
**/
diff --git a/glib/poppler-media.cc b/glib/poppler-media.cc
index 4c31b84..5712371 100644
--- a/glib/poppler-media.cc
+++ b/glib/poppler-media.cc
@@ -136,7 +136,7 @@ poppler_media_get_filename (PopplerMedia *poppler_media)
* Whether the media clip is embedded in the PDF. If the result is %TRUE, the embedded stream
* can be saved with poppler_media_save() or poppler_media_save_to_callback() function.
* If the result is %FALSE, the media clip filename can be retrieved with
- * poppler_media_get_file_name() function.
+ * poppler_media_get_filename() function.
*
* Return value: %TRUE if media clip is embedded, %FALSE otherwise
*
diff --git a/glib/poppler-page.cc b/glib/poppler-page.cc
index b5e03f1..fe47af7 100644
--- a/glib/poppler-page.cc
+++ b/glib/poppler-page.cc
@@ -470,7 +470,7 @@ create_surface_from_thumbnail_data (guchar *data,
/**
* poppler_page_get_thumbnail:
- * @page: the #PopperPage to get the thumbnail for
+ * @page: the #PopplerPage to get the thumbnail for
*
* Get the embedded thumbnail for the specified page. If the document
* doesn't have an embedded thumbnail for the page, this function
@@ -1211,7 +1211,6 @@ poppler_page_get_link_mapping (PopplerPage *page)
/**
* poppler_page_free_link_mapping:
-
* @list: (element-type PopplerLinkMapping): A list of
* #PopplerLinkMapping<!-- -->s
*
diff --git a/glib/poppler-page.h b/glib/poppler-page.h
index c151cdc..7b36843 100644
--- a/glib/poppler-page.h
+++ b/glib/poppler-page.h
@@ -157,7 +157,7 @@ void poppler_color_free (PopplerColor *color);
* @start_index: start position this text attributes apply
* @end_index: end position this text text attributes apply
*
- * A #PopplerTextInfo is used to describe text attriutes of a reange of text
+ * A #PopplerTextAttributes is used to describe text attributes of a range of text
*
* Since: 0.18
*/
@@ -290,7 +290,7 @@ void poppler_form_field_mapping_free (PopplerFormFieldMa
/**
* PopplerAnnotMapping:
* @area: a #PopplerRectangle representing an area of the page
- * @annot: a #PopplerAannot
+ * @annot: a #PopplerAnnot
*
* A #PopplerAnnotMapping structure represents the location
* of @annot on the page
diff --git a/glib/reference/poppler-sections.txt b/glib/reference/poppler-sections.txt
index 51bbbb5..c3d9a3f 100644
--- a/glib/reference/poppler-sections.txt
+++ b/glib/reference/poppler-sections.txt
@@ -78,6 +78,7 @@ POPPLER_PAGE
POPPLER_IS_PAGE
POPPLER_TYPE_PAGE
POPPLER_TYPE_RECTANGLE
+POPPLER_TYPE_TEXT_ATTRIBUTES
POPPLER_TYPE_PAGE_TRANSITION
POPPLER_TYPE_LINK_MAPPING
POPPLER_TYPE_IMAGE_MAPPING
@@ -135,7 +136,6 @@ poppler_document_get_page_layout
poppler_document_get_page_mode
poppler_document_get_permissions
poppler_document_get_metadata
-poppler_document_get_permissions
poppler_document_is_linearized
poppler_document_get_n_pages
poppler_document_get_page
@@ -352,6 +352,7 @@ POPPLER_TYPE_ORIENTATION
POPPLER_TYPE_PRINT_FLAGS
<SUBSECTION Private>
+POPPLER_DEFINE_BOXED_TYPE
poppler_error_get_type
poppler_error_quark
poppler_backend_get_type
@@ -489,6 +490,7 @@ POPPLER_IS_LAYER
POPPLER_TYPE_LAYER
<SUBSECTION Private>
+Layer
poppler_layer_get_type
</SECTION>
More information about the poppler
mailing list