glib/CMakeLists.txt | 2 +- glib/Makefile.am | 4 ++-- glib/poppler-annot.cc | 6 +++--- glib/poppler-annot.h | 2 +- glib/poppler-attachment.cc | 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 +++----- poppler/CairoFontEngine.cc | 3 +-- poppler/CairoRescaleBox.cc | 2 +- 14 files changed, 44 insertions(+), 51 deletions(-)
New commits: commit 24bbe62fa09bd4609bbf59c2b78c3aab20c09cdf Author: Hib Eris <[email protected]> Date: Tue Jan 31 20:01:30 2012 +0100 glib: Exclude poppler-private.h from introspection files Fixes bug #45455. diff --git a/glib/CMakeLists.txt b/glib/CMakeLists.txt index bc46b4d..0addd86 100644 --- a/glib/CMakeLists.txt +++ b/glib/CMakeLists.txt @@ -106,7 +106,7 @@ if (HAVE_INTROSPECTION) set(INTROSPECTION_SCANNER_ARGS "--add-include-path=${CMAKE_CURRENT_SOURCE_DIR}") set(INTROSPECTION_COMPILER_ARGS "--includedir=${CMAKE_CURRENT_SOURCE_DIR}") - set(introspection_files ${poppler_glib_SRCS} ${poppler_glib_public_headers} poppler-private.h) + set(introspection_files ${poppler_glib_SRCS} ${poppler_glib_public_headers}) set(Poppler_0_18_gir "poppler-glib") set(Poppler_0_18_gir_INCLUDES GObject-2.0 cairo-1.0) get_directory_property(_tmp_includes INCLUDE_DIRECTORIES) diff --git a/glib/Makefile.am b/glib/Makefile.am index 5c357bc..8aa2724 100644 --- a/glib/Makefile.am +++ b/glib/Makefile.am @@ -91,7 +91,7 @@ INTROSPECTION_GIRS = INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir) -introspection_files = $(libpoppler_glib_la_SOURCES) $(poppler_glib_include_HEADERS) $(nodist_poppler_glib_include_HEADERS) +introspection_files = $(filter-out poppler-private.h, $(libpoppler_glib_la_SOURCES)) $(poppler_glib_include_HEADERS) $(nodist_poppler_glib_include_HEADERS) Poppler-0.18.gir: libpoppler-glib.la Poppler_0_18_gir_INCLUDES = GObject-2.0 cairo-1.0 Poppler_0_18_gir_CFLAGS = $(INCLUDES) -I$(top_builddir) commit 19cee7961d01e59adfdd47fb311707e55f4d70c3 Author: Hib Eris <[email protected]> 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 b834425c56eb4e783419351888cf586525d12476 Author: Hib Eris <[email protected]> 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 283fa96871027719ad40db653a71e7e889f2f67f Author: Carlos Garcia Campos <[email protected]> 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 1b3e07155fbc627ef13fcb885ebda7644a65ff9a Author: Hib Eris <[email protected]> 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 ff7c42a8c04cf98e8d7e7c23bddb65781a7d9b8c Author: Hib Eris <[email protected]> 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 5dc10c5564d5cd072e37deffbbfcbf6cea25af98 Author: Hib Eris <[email protected]> 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 ecbdea38d4c35935a69e5fbd5268be86ee716a53 Author: Hib Eris <[email protected]> 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> commit 01a53a1dcaeaf81fbe5f1630cfe86f0d0b55b24b Author: Hib Eris <[email protected]> Date: Tue Jan 31 12:49:01 2012 +0100 cairo: Remove unused variable in CairoFontEngine.cc Fixes bug #45442. diff --git a/poppler/CairoFontEngine.cc b/poppler/CairoFontEngine.cc index 95ac60d..451eaef 100644 --- a/poppler/CairoFontEngine.cc +++ b/poppler/CairoFontEngine.cc @@ -106,7 +106,7 @@ CairoFont::getGlyph(CharCode code, double CairoFont::getSubstitutionCorrection(GfxFont *gfxFont) { - double w1, w2,w3; + double w1, w2; CharCode code; char *name; @@ -134,7 +134,6 @@ CairoFont::getSubstitutionCorrection(GfxFont *gfxFont) cairo_scaled_font_destroy(scaled_font); cairo_font_options_destroy(options); - w3 = extents.width; w2 = extents.x_advance; } if (!gfxFont->isSymbolic()) { commit 7bb42f045abaef2f10fe83b8c04a55ec0a34d55d Author: Hib Eris <[email protected]> Date: Tue Jan 31 14:42:04 2012 +0100 Fix return value of downscale_box_filter() Fixes bug #45441. diff --git a/poppler/CairoRescaleBox.cc b/poppler/CairoRescaleBox.cc index 234322a..943e9f7 100644 --- a/poppler/CairoRescaleBox.cc +++ b/poppler/CairoRescaleBox.cc @@ -347,5 +347,5 @@ cleanup: free (y_coverage); free (temp_buf); - return gTrue; + return retval; } commit f6131e05f1e81f062c77377650bcd0746b8fc04f Author: Hib Eris <[email protected]> Date: Tue Jan 31 13:02:16 2012 +0100 Fix return value of poppler_attachment_save Fixes bug #45440. diff --git a/glib/poppler-attachment.cc b/glib/poppler-attachment.cc index d07f1ab..874bffb 100644 --- a/glib/poppler-attachment.cc +++ b/glib/poppler-attachment.cc @@ -210,7 +210,7 @@ poppler_attachment_save (PopplerAttachment *attachment, return FALSE; } - return TRUE; + return result; } #define BUF_SIZE 1024 commit 5aedb2378b9e4aa438d39ac92e53bac02d3e176a Author: Hib Eris <[email protected]> Date: Tue Jan 31 12:15:51 2012 +0100 Fix build for builddir != srcdir Fixes bug #45434. diff --git a/glib/Makefile.am b/glib/Makefile.am index 54e4085..5c357bc 100644 --- a/glib/Makefile.am +++ b/glib/Makefile.am @@ -96,7 +96,7 @@ Poppler-0.18.gir: libpoppler-glib.la Poppler_0_18_gir_INCLUDES = GObject-2.0 cairo-1.0 Poppler_0_18_gir_CFLAGS = $(INCLUDES) -I$(top_builddir) Poppler_0_18_gir_LIBS = libpoppler-glib.la -Poppler_0_18_gir_FILES = $(addprefix $(srcdir)/, $(introspection_files)) +Poppler_0_18_gir_FILES = $(introspection_files) Poppler_0_18_gir_SCANNERFLAGS = --c-include poppler.h Poppler_0_18_gir_EXPORT_PACKAGES = poppler-glib _______________________________________________ poppler mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/poppler
