![](https://seccdn.libravatar.org/avatar/e2145bc5cf53dda95c308a3c75e8fef3.jpg?s=120&d=mm&r=g)
Hello community, here is the log from the commit of package poppler for openSUSE:Factory checked in at 2015-08-05 19:13:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/poppler (Old) and /work/SRC/openSUSE:Factory/.poppler.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "poppler" Changes: -------- --- /work/SRC/openSUSE:Factory/poppler/poppler-qt.changes 2015-05-20 23:26:41.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.poppler.new/poppler-qt.changes 2015-08-05 19:13:22.000000000 +0200 @@ -1,0 +2,16 @@ +Thu Jul 9 21:27:17 UTC 2015 - zaitor@opensuse.org + +- Update to version 0.34.0: + + core: + - Splash: + . Fix crash in PDF with nested softmasks (fdo#91240). + . Speed up of rendering icc based images (fdo#90171). + - PSOutputDev: Embed Type1 fonts to PostScript files correctly + (fdo#19747). + - Fix pedantic memory leak. + + glib: Update new symbols section. + + Build system: cmake: Make sure ENABLE_LIBOPENJPEG is either 0 + or 1. +- Bump poppler soname following upstream changes. + +------------------------------------------------------------------- poppler-qt5.changes: same change poppler.changes: same change Old: ---- poppler-0.33.0.tar.xz New: ---- poppler-0.34.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ poppler-qt.spec ++++++ --- /var/tmp/diff_new_pack.xEYqkh/_old 2015-08-05 19:13:23.000000000 +0200 +++ /var/tmp/diff_new_pack.xEYqkh/_new 2015-08-05 19:13:23.000000000 +0200 @@ -21,11 +21,11 @@ Name: poppler-qt %define _name poppler -Version: 0.33.0 +Version: 0.34.0 Release: 0 # Actual version of poppler-data: %define poppler_data_version 0.4.6 -%define poppler_soname 52 +%define poppler_soname 53 %define poppler_cpp_soname 0 %define poppler_glib_soname 8 %define poppler_qt4_soname 4 poppler-qt5.spec: same change ++++++ poppler.spec ++++++ --- /var/tmp/diff_new_pack.xEYqkh/_old 2015-08-05 19:13:23.000000000 +0200 +++ /var/tmp/diff_new_pack.xEYqkh/_new 2015-08-05 19:13:23.000000000 +0200 @@ -21,11 +21,11 @@ Name: poppler %define _name poppler -Version: 0.33.0 +Version: 0.34.0 Release: 0 # Actual version of poppler-data: %define poppler_data_version 0.4.6 -%define poppler_soname 52 +%define poppler_soname 53 %define poppler_cpp_soname 0 %define poppler_glib_soname 8 %define poppler_qt4_soname 4 ++++++ poppler-0.33.0.tar.xz -> poppler-0.34.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.33.0/CMakeLists.txt new/poppler-0.34.0/CMakeLists.txt --- old/poppler-0.33.0/CMakeLists.txt 2015-05-14 20:22:31.000000000 +0200 +++ new/poppler-0.34.0/CMakeLists.txt 2015-07-08 22:14:54.000000000 +0200 @@ -22,7 +22,7 @@ endif() set(POPPLER_MAJOR_VERSION "0") -set(POPPLER_MINOR_VERSION "33") +set(POPPLER_MINOR_VERSION "34") set(POPPLER_MICRO_VERSION "0") set(POPPLER_VERSION "${POPPLER_MAJOR_VERSION}.${POPPLER_MINOR_VERSION}.${POPPLER_MICRO_VERSION}") @@ -158,6 +158,7 @@ endif(ENABLE_ZLIB) set(USE_OPENJPEG1 FALSE) set(USE_OPENJPEG2 FALSE) +set(WITH_OPENJPEG FALSE) if(ENABLE_LIBOPENJPEG STREQUAL "auto") find_package(LIBOPENJPEG) set(USE_OPENJPEG1 ${LIBOPENJPEG_FOUND}) @@ -176,6 +177,7 @@ set(USE_OPENJPEG2 ${LIBOPENJPEG2_FOUND}) set(WITH_OPENJPEG ${LIBOPENJPEG2_FOUND}) endif() +set(ENABLE_LIBOPENJPEG "${WITH_OPENJPEG}") if(ENABLE_CMS STREQUAL "auto") find_package(LCMS2) set(USE_CMS ${LCMS2_FOUND}) @@ -474,7 +476,7 @@ else(MSVC) add_library(poppler SHARED ${poppler_SRCS}) endif(MSVC) -set_target_properties(poppler PROPERTIES VERSION 52.0.0 SOVERSION 52) +set_target_properties(poppler PROPERTIES VERSION 53.0.0 SOVERSION 53) target_link_libraries(poppler ${poppler_LIBS}) target_link_libraries(poppler LINK_INTERFACE_LIBRARIES "") install(TARGETS poppler RUNTIME DESTINATION bin LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.33.0/ChangeLog new/poppler-0.34.0/ChangeLog --- old/poppler-0.33.0/ChangeLog 2015-05-14 21:48:33.000000000 +0200 +++ new/poppler-0.34.0/ChangeLog 2015-07-08 22:27:41.000000000 +0200 @@ -1,3 +1,128 @@ +commit 2fc1f540754391ffa87d7fe9f3438e134d821207 +Author: Thomas Freitag <Thomas.Freitag@alfa.de> +Date: Tue Jul 7 18:48:51 2015 +0200 + + [Splash] Fix crash in PDF with nested softmasks + + Bug #91240 + + poppler/SplashOutputDev.cc | 20 ++++++++++++-------- + 1 file changed, 12 insertions(+), 8 deletions(-) + +commit 0b8919f19dd501c9962bca05c9b0559464e923c3 +Author: Dmytro Morgun <lztoad@gmail.com> +Date: Mon Jul 6 00:28:27 2015 +0200 + + Fix pedantic memory leak + + poppler/StructElement.cc | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +commit 2ef22af960d3d800087209fea047009a8419134c +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Jul 5 16:03:57 2015 +0200 + + [cmake] Make sure ENABLE_LIBOPENJPEG is either 0 or 1 + + Otherwise if it was auto it gets translated to 1 for the cmakedefine + boolean + which is wrong when the auto ends up meaning "i din't find it" + + CMakeLists.txt | 2 ++ + 1 file changed, 2 insertions(+) + +commit 50455bcf4f1644060b2187d4e60c3798793041cc +Author: Tamas Szekeres <szekerest@gmail.com> +Date: Fri Jul 3 20:24:01 2015 +0200 + + std::max/min need <algorithm> + + Bug #88511 + + cpp/poppler-font.cpp | 3 +++ + cpp/poppler-global.cpp | 3 +++ + poppler/Annot.cc | 2 ++ + poppler/SplashOutputDev.cc | 2 ++ + 4 files changed, 10 insertions(+) + +commit 346fc70dbf2803e23e70b093401aa2cda216492b +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Jul 3 20:19:01 2015 +0200 + + Forgot the (C) + + poppler/PSOutputDev.cc | 1 + + 1 file changed, 1 insertion(+) + +commit df09c1a84dfe80d2e6cfde3308c79da5b2ea7428 +Author: Marek Kasik <mkasik@redhat.com> +Date: Fri Jul 3 20:14:23 2015 +0200 + + Embed Type1 fonts to PostScript files correctly + + Remove PFB headers from embedded Type1 fonts + before embedding them into a PostScript file. + + Bug #19747 + + poppler/PSOutputDev.cc | 57 + +++++++++++++++++++++++++++++++++++++++++++------- + 1 file changed, 50 insertions(+), 7 deletions(-) + +commit 11f117cc71641b89783b207232171f850a2b64ff +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Thu Jun 4 10:51:36 2015 +0200 + + regtest: Disable pretty diffs for text files in HTML reports + + difflib is entering in an infinite loop with some files, so disable it + for now. We need to either fix that somehow or find a different way to + generate pretty diffs of text files. + + regtest/HTMLReport.py | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +commit 3db4cb6f07229e26405bfb512c626a272f6351f5 +Author: Thomas Freitag <Thomas.Freitag@alfa.de> +Date: Sun May 24 18:41:30 2015 +0200 + + Splash: Speed up of rendering icc based images + + Bug #90171 + + poppler/SplashOutputDev.cc | 142 + +++++++++++++++++++++++++++++++++++++++++++-- + poppler/SplashOutputDev.h | 8 ++- + splash/Splash.cc | 17 ++++-- + splash/Splash.h | 9 ++- + 4 files changed, 163 insertions(+), 13 deletions(-) + +commit c50720dcc9e15516e0e19072c0df03fbdee63dec +Author: Adrian Johnson <ajohnson@redneon.com> +Date: Fri May 22 21:44:55 2015 +0930 + + glib: update new symbols section + + glib/reference/poppler-docs.sgml | 8 ++++++++ + 1 file changed, 8 insertions(+) + +commit b271a19ec30b20bc11f2240ae6b96672e3cafafb +Author: Albert Astals Cid <aacid@kde.org> +Date: Thu May 14 21:56:47 2015 +0200 + + Poppler 0.33 + + CMakeLists.txt | 4 ++-- + NEWS | 25 +++++++++++++++++++++++++ + configure.ac | 2 +- + cpp/Doxyfile | 2 +- + glib/CMakeLists.txt | 2 +- + glib/Makefile.am | 2 +- + poppler/Makefile.am | 2 +- + qt4/src/Doxyfile | 2 +- + qt5/src/Doxyfile | 2 +- + 9 files changed, 34 insertions(+), 9 deletions(-) + commit 2b2fb719aa5ffe32fbc3fb500444b1643b1c6099 Author: Albert Astals Cid <aacid@kde.org> Date: Thu May 14 20:17:12 2015 +0200 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.33.0/NEWS new/poppler-0.34.0/NEWS --- old/poppler-0.33.0/NEWS 2015-05-14 20:20:41.000000000 +0200 +++ new/poppler-0.34.0/NEWS 2015-07-08 22:13:12.000000000 +0200 @@ -1,3 +1,16 @@ +Release 0.34.0 + core: + * Splash: Fix crash in PDF with nested softmasks. Bug #91240 + * Splash: Speed up of rendering icc based images. Bug #90171 + * PSOutputDev: Embed Type1 fonts to PostScript files correctly. Bug #19747 + * Fix pedantic memory leak + + glib: + * update new symbols section + + build system: + * cmake: Make sure ENABLE_LIBOPENJPEG is either 0 or 1 + Release 0.33.0 core: * Fix regression in pdftops parameter passing. Bug #89827 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.33.0/configure new/poppler-0.34.0/configure --- old/poppler-0.33.0/configure 2015-05-14 20:26:14.000000000 +0200 +++ new/poppler-0.34.0/configure 2015-07-08 22:17:17.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for poppler 0.33.0. +# Generated by GNU Autoconf 2.69 for poppler 0.34.0. # # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=poppler>. # @@ -591,8 +591,8 @@ # Identity of this package. PACKAGE_NAME='poppler' PACKAGE_TARNAME='poppler' -PACKAGE_VERSION='0.33.0' -PACKAGE_STRING='poppler 0.33.0' +PACKAGE_VERSION='0.34.0' +PACKAGE_STRING='poppler 0.34.0' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=poppler' PACKAGE_URL='' @@ -1528,7 +1528,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures poppler 0.33.0 to adapt to many kinds of systems. +\`configure' configures poppler 0.34.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1602,7 +1602,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of poppler 0.33.0:";; + short | recursive ) echo "Configuration of poppler 0.34.0:";; esac cat <<\_ACEOF @@ -1818,7 +1818,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -poppler configure 0.33.0 +poppler configure 0.34.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2512,7 +2512,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by poppler $as_me 0.33.0, which was +It was created by poppler $as_me 0.34.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3376,7 +3376,7 @@ # Define the identity of the package. PACKAGE='poppler' - VERSION='0.33.0' + VERSION='0.34.0' cat >>confdefs.h <<_ACEOF @@ -17772,7 +17772,7 @@ cat >>confdefs.h <<_ACEOF -#define POPPLER_VERSION "0.33.0" +#define POPPLER_VERSION "0.34.0" _ACEOF @@ -24966,11 +24966,11 @@ POPPLER_MAJOR_VERSION=0 -POPPLER_MINOR_VERSION=33 +POPPLER_MINOR_VERSION=34 POPPLER_MICRO_VERSION=0 -POPPLER_VERSION=0.33.0 +POPPLER_VERSION=0.34.0 ac_config_files="$ac_config_files Makefile goo/Makefile fofi/Makefile splash/Makefile poppler/Makefile utils/Makefile glib/Makefile glib/poppler-features.h glib/reference/Makefile glib/reference/version.xml glib/demo/Makefile test/Makefile qt4/Makefile qt4/src/Makefile qt4/tests/Makefile qt4/demos/Makefile qt5/Makefile qt5/src/Makefile qt5/tests/Makefile qt5/demos/Makefile cpp/Makefile cpp/poppler-version.h cpp/tests/Makefile poppler.pc poppler-uninstalled.pc poppler-cairo.pc poppler-cairo-uninstalled.pc poppler-splash.pc poppler-splash-uninstalled.pc poppler-glib.pc poppler-glib-uninstalled.pc poppler-qt4.pc poppler-qt4-uninstalled.pc poppler-qt5.pc poppler-qt5-uninstalled.pc poppler-cpp.pc poppler-cpp-uninstalled.pc" @@ -25622,7 +25622,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by poppler $as_me 0.33.0, which was +This file was extended by poppler $as_me 0.34.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -25688,7 +25688,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -poppler config.status 0.33.0 +poppler config.status 0.34.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.33.0/configure.ac new/poppler-0.34.0/configure.ac --- old/poppler-0.33.0/configure.ac 2015-05-14 20:21:10.000000000 +0200 +++ new/poppler-0.34.0/configure.ac 2015-07-08 22:13:27.000000000 +0200 @@ -1,5 +1,5 @@ m4_define([poppler_version_major],[0]) -m4_define([poppler_version_minor],[33]) +m4_define([poppler_version_minor],[34]) m4_define([poppler_version_micro],[0]) m4_define([poppler_version],[poppler_version_major.poppler_version_minor.poppler_version_micro]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.33.0/cpp/poppler-font.cpp new/poppler-0.34.0/cpp/poppler-font.cpp --- old/poppler-0.33.0/cpp/poppler-font.cpp 2014-04-10 23:36:00.000000000 +0200 +++ new/poppler-0.34.0/cpp/poppler-font.cpp 2015-07-03 20:23:39.000000000 +0200 @@ -1,5 +1,6 @@ /* * Copyright (C) 2009, Pino Toscano <pino@kde.org> + * Copyright (C) 2015, Tamas Szekeres <szekerest@gmail.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -22,6 +23,8 @@ #include "FontInfo.h" +#include <algorithm> + using namespace poppler; class poppler::font_info_private diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.33.0/cpp/poppler-global.cpp new/poppler-0.34.0/cpp/poppler-global.cpp --- old/poppler-0.33.0/cpp/poppler-global.cpp 2014-12-14 14:57:50.000000000 +0100 +++ new/poppler-0.34.0/cpp/poppler-global.cpp 2015-07-03 20:23:35.000000000 +0200 @@ -2,6 +2,7 @@ * Copyright (C) 2009-2010, Pino Toscano <pino@kde.org> * Copyright (C) 2010, Hib Eris <hib@hiberis.nl> * Copyright (C) 2014, Hans-Peter Deifel <hpdeifel@gmx.de> + * Copyright (C) 2015, Tamas Szekeres <szekerest@gmail.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -22,6 +23,8 @@ #include "poppler-private.h" +#include <algorithm> + #include <cerrno> #include <cstring> #include <ios> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.33.0/cpp/poppler-version.h new/poppler-0.34.0/cpp/poppler-version.h --- old/poppler-0.33.0/cpp/poppler-version.h 2015-05-14 20:26:24.000000000 +0200 +++ new/poppler-0.34.0/cpp/poppler-version.h 2015-07-08 22:17:24.000000000 +0200 @@ -21,9 +21,9 @@ #include "poppler-global.h" -#define POPPLER_VERSION "0.33.0" +#define POPPLER_VERSION "0.34.0" #define POPPLER_VERSION_MAJOR 0 -#define POPPLER_VERSION_MINOR 33 +#define POPPLER_VERSION_MINOR 34 #define POPPLER_VERSION_MICRO 0 namespace poppler diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.33.0/glib/reference/html/annotation-glossary.html new/poppler-0.34.0/glib/reference/html/annotation-glossary.html --- old/poppler-0.33.0/glib/reference/html/annotation-glossary.html 2015-05-14 21:48:34.000000000 +0200 +++ new/poppler-0.34.0/glib/reference/html/annotation-glossary.html 2015-07-08 22:27:42.000000000 +0200 @@ -6,7 +6,7 @@ <meta name="generator" content="DocBook XSL Stylesheets V1.78.1"> <link rel="home" href="index.html" title="Poppler Reference Manual"> <link rel="up" href="index.html" title="Poppler Reference Manual"> -<link rel="prev" href="api-index-0-22.html" title="Index of new symbols in 0.22"> +<link rel="prev" href="api-index-0-33.html" title="Index of new symbols in 0.33"> <meta name="generator" content="GTK-Doc V1.21 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> @@ -25,7 +25,7 @@ <a class="shortcut" href="#glsT">T</a></span></td> <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td> <td><img src="up-insensitive.png" width="16" height="16" border="0"></td> -<td><a accesskey="p" href="api-index-0-22.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td> +<td><a accesskey="p" href="api-index-0-33.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td> <td><img src="right-insensitive.png" width="16" height="16" border="0"></td> </tr></table> <div class="glossary"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.33.0/glib/reference/html/api-index-0-22.html new/poppler-0.34.0/glib/reference/html/api-index-0-22.html --- old/poppler-0.33.0/glib/reference/html/api-index-0-22.html 2015-05-14 21:48:34.000000000 +0200 +++ new/poppler-0.34.0/glib/reference/html/api-index-0-22.html 2015-07-08 22:27:42.000000000 +0200 @@ -7,7 +7,7 @@ <link rel="home" href="index.html" title="Poppler Reference Manual"> <link rel="up" href="index.html" title="Poppler Reference Manual"> <link rel="prev" href="api-index-0-20.html" title="Index of new symbols in 0.20"> -<link rel="next" href="annotation-glossary.html" title="Annotation Glossary"> +<link rel="next" href="api-index-0-26.html" title="Index of new symbols in 0.26"> <meta name="generator" content="GTK-Doc V1.21 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> @@ -23,7 +23,7 @@ <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td> <td><img src="up-insensitive.png" width="16" height="16" border="0"></td> <td><a accesskey="p" href="api-index-0-20.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td> -<td><a accesskey="n" href="annotation-glossary.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td> +<td><a accesskey="n" href="api-index-0-26.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td> </tr></table> <div class="index"> <div class="titlepage"><div><div><h1 class="title"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.33.0/glib/reference/html/api-index-0-26.html new/poppler-0.34.0/glib/reference/html/api-index-0-26.html --- old/poppler-0.33.0/glib/reference/html/api-index-0-26.html 1970-01-01 01:00:00.000000000 +0100 +++ new/poppler-0.34.0/glib/reference/html/api-index-0-26.html 2015-07-08 22:27:42.000000000 +0200 @@ -0,0 +1,419 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<html> +<head> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> +<title>Poppler Reference Manual: Index of new symbols in 0.26</title> +<meta name="generator" content="DocBook XSL Stylesheets V1.78.1"> +<link rel="home" href="index.html" title="Poppler Reference Manual"> +<link rel="up" href="index.html" title="Poppler Reference Manual"> +<link rel="prev" href="api-index-0-22.html" title="Index of new symbols in 0.22"> +<link rel="next" href="api-index-0-33.html" title="Index of new symbols in 0.33"> +<meta name="generator" content="GTK-Doc V1.21 (XML mode)"> +<link rel="stylesheet" href="style.css" type="text/css"> +</head> +<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> +<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle"> +<td width="100%" align="left" class="shortcuts"><span id="nav_index"><a class="shortcut" href="#idxA">A</a> + <span class="dim">|</span> + <a class="shortcut" href="#idxP">P</a> + <span class="dim">|</span> + <a class="shortcut" href="#idxQ">Q</a> + <span class="dim">|</span> + <a class="shortcut" href="#idxS">S</a> + <span class="dim">|</span> + <a class="shortcut" href="#idxT">T</a></span></td> +<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td> +<td><img src="up-insensitive.png" width="16" height="16" border="0"></td> +<td><a accesskey="p" href="api-index-0-22.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td> +<td><a accesskey="n" href="api-index-0-33.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td> +</tr></table> +<div class="index"> +<div class="titlepage"><div><div><h1 class="title"> +<a name="api-index-0-26"></a>Index of new symbols in 0.26</h1></div></div></div> +<a name="idx"></a><a name="idxA"></a><h3 class="title">A</h3> +<dt> +<a class="link" href="PopplerAnnot.html#poppler-annot-circle-get-interior-color" title="poppler_annot_circle_get_interior_color ()">poppler_annot_circle_get_interior_color</a>, function in <a class="link" href="PopplerAnnot.html" title="PopplerAnnot">PopplerAnnot</a> +</dt> +<dd></dd> +<dt> +<a class="link" href="PopplerAnnot.html#poppler-annot-circle-new" title="poppler_annot_circle_new ()">poppler_annot_circle_new</a>, function in <a class="link" href="PopplerAnnot.html" title="PopplerAnnot">PopplerAnnot</a> +</dt> +<dd></dd> +<dt> +<a class="link" href="PopplerAnnot.html#poppler-annot-circle-set-interior-color" title="poppler_annot_circle_set_interior_color ()">poppler_annot_circle_set_interior_color</a>, function in <a class="link" href="PopplerAnnot.html" title="PopplerAnnot">PopplerAnnot</a> +</dt> +<dd></dd> +<dt> +<a class="link" href="PopplerAnnot.html#poppler-annot-get-rectangle" title="poppler_annot_get_rectangle ()">poppler_annot_get_rectangle</a>, function in <a class="link" href="PopplerAnnot.html" title="PopplerAnnot">PopplerAnnot</a> +</dt> +<dd></dd> +<dt> +<a class="link" href="PopplerAnnot.html#poppler-annot-line-new" title="poppler_annot_line_new ()">poppler_annot_line_new</a>, function in <a class="link" href="PopplerAnnot.html" title="PopplerAnnot">PopplerAnnot</a> +</dt> +<dd></dd> +<dt> +<a class="link" href="PopplerAnnot.html#poppler-annot-line-set-vertices" title="poppler_annot_line_set_vertices ()">poppler_annot_line_set_vertices</a>, function in <a class="link" href="PopplerAnnot.html" title="PopplerAnnot">PopplerAnnot</a> +</dt> +<dd></dd> +<dt> +<a class="link" href="PopplerAnnot.html#poppler-annot-set-rectangle" title="poppler_annot_set_rectangle ()">poppler_annot_set_rectangle</a>, function in <a class="link" href="PopplerAnnot.html" title="PopplerAnnot">PopplerAnnot</a> +</dt> +<dd></dd> +<dt> +<a class="link" href="PopplerAnnot.html#poppler-annot-square-get-interior-color" title="poppler_annot_square_get_interior_color ()">poppler_annot_square_get_interior_color</a>, function in <a class="link" href="PopplerAnnot.html" title="PopplerAnnot">PopplerAnnot</a> +</dt> +<dd></dd> +<dt> +<a class="link" href="PopplerAnnot.html#poppler-annot-square-new" title="poppler_annot_square_new ()">poppler_annot_square_new</a>, function in <a class="link" href="PopplerAnnot.html" title="PopplerAnnot">PopplerAnnot</a> +</dt> +<dd></dd> +<dt> +<a class="link" href="PopplerAnnot.html#poppler-annot-square-set-interior-color" title="poppler_annot_square_set_interior_color ()">poppler_annot_square_set_interior_color</a>, function in <a class="link" href="PopplerAnnot.html" title="PopplerAnnot">PopplerAnnot</a> +</dt> +<dd></dd> +<dt> +<a class="link" href="PopplerAnnot.html#poppler-annot-text-markup-get-quadrilaterals" title="poppler_annot_text_markup_get_quadrilaterals ()">poppler_annot_text_markup_get_quadrilaterals</a>, function in <a class="link" href="PopplerAnnot.html" title="PopplerAnnot">PopplerAnnot</a> +</dt> +<dd></dd> +<dt> +<a class="link" href="PopplerAnnot.html#poppler-annot-text-markup-new-highlight" title="poppler_annot_text_markup_new_highlight ()">poppler_annot_text_markup_new_highlight</a>, function in <a class="link" href="PopplerAnnot.html" title="PopplerAnnot">PopplerAnnot</a> +</dt> +<dd></dd> +<dt> +<a class="link" href="PopplerAnnot.html#poppler-annot-text-markup-new-squiggly" title="poppler_annot_text_markup_new_squiggly ()">poppler_annot_text_markup_new_squiggly</a>, function in <a class="link" href="PopplerAnnot.html" title="PopplerAnnot">PopplerAnnot</a> +</dt> +<dd></dd> +<dt> +<a class="link" href="PopplerAnnot.html#poppler-annot-text-markup-new-strikeout" title="poppler_annot_text_markup_new_strikeout ()">poppler_annot_text_markup_new_strikeout</a>, function in <a class="link" href="PopplerAnnot.html" title="PopplerAnnot">PopplerAnnot</a> +</dt> +<dd></dd> +<dt> +<a class="link" href="PopplerAnnot.html#poppler-annot-text-markup-new-underline" title="poppler_annot_text_markup_new_underline ()">poppler_annot_text_markup_new_underline</a>, function in <a class="link" href="PopplerAnnot.html" title="PopplerAnnot">PopplerAnnot</a> +</dt> +<dd></dd> +<dt> +<a class="link" href="PopplerAnnot.html#poppler-annot-text-markup-set-quadrilaterals" title="poppler_annot_text_markup_set_quadrilaterals ()">poppler_annot_text_markup_set_quadrilaterals</a>, function in <a class="link" href="PopplerAnnot.html" title="PopplerAnnot">PopplerAnnot</a> +</dt> +<dd></dd> +<a name="idxP"></a><h3 class="title">P</h3> +<dt> +<a class="link" href="PopplerPage.html#poppler-page-get-text-attributes-for-area" title="poppler_page_get_text_attributes_for_area ()">poppler_page_get_text_attributes_for_area</a>, function in <a class="link" href="PopplerPage.html" title="PopplerPage">PopplerPage</a> +</dt> +<dd></dd> +<dt> +<a class="link" href="PopplerPage.html#poppler-page-get-text-for-area" title="poppler_page_get_text_for_area ()">poppler_page_get_text_for_area</a>, function in <a class="link" href="PopplerPage.html" title="PopplerPage">PopplerPage</a> +</dt> +<dd></dd> +<dt> +<a class="link" href="PopplerPage.html#poppler-page-get-text-layout-for-area" title="poppler_page_get_text_layout_for_area ()">poppler_page_get_text_layout_for_area</a>, function in <a class="link" href="PopplerPage.html" title="PopplerPage">PopplerPage</a> +</dt> +<dd></dd> +<dt> +<a class="link" href="PopplerAnnot.html#poppler-point-copy" title="poppler_point_copy ()">poppler_point_copy</a>, function in <a class="link" href="PopplerAnnot.html" title="PopplerAnnot">PopplerAnnot</a> +</dt> +<dd></dd> +<dt> +<a class="link" href="PopplerAnnot.html#poppler-point-free" title="poppler_point_free ()">poppler_point_free</a>, function in <a class="link" href="PopplerAnnot.html" title="PopplerAnnot">PopplerAnnot</a> +</dt> +<dd></dd> +<dt> +<a class="link" href="PopplerAnnot.html#poppler-point-new" title="poppler_point_new ()">poppler_point_new</a>, function in <a class="link" href="PopplerAnnot.html" title="PopplerAnnot">PopplerAnnot</a> +</dt> +<dd></dd> +<a name="idxQ"></a><h3 class="title">Q</h3> +<dt> +<a class="link" href="PopplerAnnot.html#PopplerQuadrilateral" title="PopplerQuadrilateral">PopplerQuadrilateral</a>, struct in <a class="link" href="PopplerAnnot.html" title="PopplerAnnot">PopplerAnnot</a> +</dt> +<dd></dd> +<dt> +<a class="link" href="PopplerAnnot.html#poppler-quadrilateral-copy" title="poppler_quadrilateral_copy ()">poppler_quadrilateral_copy</a>, function in <a class="link" href="PopplerAnnot.html" title="PopplerAnnot">PopplerAnnot</a> +</dt> +<dd></dd> +<dt> +<a class="link" href="PopplerAnnot.html#poppler-quadrilateral-free" title="poppler_quadrilateral_free ()">poppler_quadrilateral_free</a>, function in <a class="link" href="PopplerAnnot.html" title="PopplerAnnot">PopplerAnnot</a> +</dt> +<dd></dd> +<dt> +<a class="link" href="PopplerAnnot.html#poppler-quadrilateral-new" title="poppler_quadrilateral_new ()">poppler_quadrilateral_new</a>, function in <a class="link" href="PopplerAnnot.html" title="PopplerAnnot">PopplerAnnot</a> +</dt> +<dd></dd> +<a name="idxS"></a><h3 class="title">S</h3> +<dt> +<a class="link" href="PopplerStructureElement.html#poppler-structure-element-get-actual-text" title="poppler_structure_element_get_actual_text ()">poppler_structure_element_get_actual_text</a>, function in <a class="link" href="PopplerStructureElement.html" title="PopplerStructureElement">PopplerStructureElement</a> +</dt> +<dd></dd> +<dt> +<a class="link" href="PopplerStructureElement.html#poppler-structure-element-get-alt-text" title="poppler_structure_element_get_alt_text ()">poppler_structure_element_get_alt_text</a>, function in <a class="link" href="PopplerStructureElement.html" title="PopplerStructureElement">PopplerStructureElement</a> +</dt> +<dd></dd> +<dt> +<a class="link" href="PopplerStructureElement.html#poppler-structure-element-get-background-color" title="poppler_structure_element_get_background_color ()">poppler_structure_element_get_background_color</a>, function in <a class="link" href="PopplerStructureElement.html" title="PopplerStructureElement">PopplerStructureElement</a> +</dt> +<dd></dd> +<dt> +<a class="link" href="PopplerStructureElement.html#poppler-structure-element-get-baseline-shift" title="poppler_structure_element_get_baseline_shift ()">poppler_structure_element_get_baseline_shift</a>, function in <a class="link" href="PopplerStructureElement.html" title="PopplerStructureElement">PopplerStructureElement</a> +</dt> +<dd></dd> +<dt> +<a class="link" href="PopplerStructureElement.html#poppler-structure-element-get-block-align" title="poppler_structure_element_get_block_align ()">poppler_structure_element_get_block_align</a>, function in <a class="link" href="PopplerStructureElement.html" title="PopplerStructureElement">PopplerStructureElement</a> +</dt> +<dd></dd> +<dt> +<a class="link" href="PopplerStructureElement.html#poppler-structure-element-get-border-color" title="poppler_structure_element_get_border_color ()">poppler_structure_element_get_border_color</a>, function in <a class="link" href="PopplerStructureElement.html" title="PopplerStructureElement">PopplerStructureElement</a> +</dt> +<dd></dd> +<dt> +<a class="link" href="PopplerStructureElement.html#poppler-structure-element-get-border-style" title="poppler_structure_element_get_border_style ()">poppler_structure_element_get_border_style</a>, function in <a class="link" href="PopplerStructureElement.html" title="PopplerStructureElement">PopplerStructureElement</a> +</dt> +<dd></dd> +<dt> +<a class="link" href="PopplerStructureElement.html#poppler-structure-element-get-border-thickness" title="poppler_structure_element_get_border_thickness ()">poppler_structure_element_get_border_thickness</a>, function in <a class="link" href="PopplerStructureElement.html" title="PopplerStructureElement">PopplerStructureElement</a> +</dt> +<dd></dd> +<dt> +<a class="link" href="PopplerStructureElement.html#poppler-structure-element-get-bounding-box" title="poppler_structure_element_get_bounding_box ()">poppler_structure_element_get_bounding_box</a>, function in <a class="link" href="PopplerStructureElement.html" title="PopplerStructureElement">PopplerStructureElement</a> +</dt> +<dd></dd> +<dt> +<a class="link" href="PopplerStructureElement.html#poppler-structure-element-get-color" title="poppler_structure_element_get_color ()">poppler_structure_element_get_color</a>, function in <a class="link" href="PopplerStructureElement.html" title="PopplerStructureElement">PopplerStructureElement</a> +</dt> +<dd></dd> +<dt> +<a class="link" href="PopplerStructureElement.html#poppler-structure-element-get-column-count" title="poppler_structure_element_get_column_count ()">poppler_structure_element_get_column_count</a>, function in <a class="link" href="PopplerStructureElement.html" title="PopplerStructureElement">PopplerStructureElement</a> +</dt> +<dd></dd> +<dt> +<a class="link" href="PopplerStructureElement.html#poppler-structure-element-get-column-gaps" title="poppler_structure_element_get_column_gaps ()">poppler_structure_element_get_column_gaps</a>, function in <a class="link" href="PopplerStructureElement.html" title="PopplerStructureElement">PopplerStructureElement</a> +</dt> +<dd></dd> +<dt> +<a class="link" href="PopplerStructureElement.html#poppler-structure-element-get-column-widths" title="poppler_structure_element_get_column_widths ()">poppler_structure_element_get_column_widths</a>, function in <a class="link" href="PopplerStructureElement.html" title="PopplerStructureElement">PopplerStructureElement</a> +</dt> +<dd></dd> +<dt> +<a class="link" href="PopplerStructureElement.html#poppler-structure-element-get-end-indent" title="poppler_structure_element_get_end_indent ()">poppler_structure_element_get_end_indent</a>, function in <a class="link" href="PopplerStructureElement.html" title="PopplerStructureElement">PopplerStructureElement</a> +</dt> +<dd></dd> +<dt> +<a class="link" href="PopplerStructureElement.html#poppler-structure-element-get-form-description" title="poppler_structure_element_get_form_description ()">poppler_structure_element_get_form_description</a>, function in <a class="link" href="PopplerStructureElement.html" title="PopplerStructureElement">PopplerStructureElement</a> +</dt> +<dd></dd> +<dt> +<a class="link" href="PopplerStructureElement.html#poppler-structure-element-get-form-role" title="poppler_structure_element_get_form_role ()">poppler_structure_element_get_form_role</a>, function in <a class="link" href="PopplerStructureElement.html" title="PopplerStructureElement">PopplerStructureElement</a> +</dt> +<dd></dd> +<dt> +<a class="link" href="PopplerStructureElement.html#poppler-structure-element-get-form-state" title="poppler_structure_element_get_form_state ()">poppler_structure_element_get_form_state</a>, function in <a class="link" href="PopplerStructureElement.html" title="PopplerStructureElement">PopplerStructureElement</a> +</dt> +<dd></dd> +<dt> +<a class="link" href="PopplerStructureElement.html#poppler-structure-element-get-glyph-orientation" title="poppler_structure_element_get_glyph_orientation ()">poppler_structure_element_get_glyph_orientation</a>, function in <a class="link" href="PopplerStructureElement.html" title="PopplerStructureElement">PopplerStructureElement</a> +</dt> +<dd></dd> +<dt> +<a class="link" href="PopplerStructureElement.html#poppler-structure-element-get-height" title="poppler_structure_element_get_height ()">poppler_structure_element_get_height</a>, function in <a class="link" href="PopplerStructureElement.html" title="PopplerStructureElement">PopplerStructureElement</a> +</dt> +<dd></dd> +<dt> +<a class="link" href="PopplerStructureElement.html#poppler-structure-element-get-id" title="poppler_structure_element_get_id ()">poppler_structure_element_get_id</a>, function in <a class="link" href="PopplerStructureElement.html" title="PopplerStructureElement">PopplerStructureElement</a> +</dt> +<dd></dd> +<dt> +<a class="link" href="PopplerStructureElement.html#poppler-structure-element-get-inline-align" title="poppler_structure_element_get_inline_align ()">poppler_structure_element_get_inline_align</a>, function in <a class="link" href="PopplerStructureElement.html" title="PopplerStructureElement">PopplerStructureElement</a> +</dt> +<dd></dd> +<dt> +<a class="link" href="PopplerStructureElement.html#poppler-structure-element-get-kind" title="poppler_structure_element_get_kind ()">poppler_structure_element_get_kind</a>, function in <a class="link" href="PopplerStructureElement.html" title="PopplerStructureElement">PopplerStructureElement</a> +</dt> +<dd></dd> +<dt> +<a class="link" href="PopplerStructureElement.html#poppler-structure-element-get-language" title="poppler_structure_element_get_language ()">poppler_structure_element_get_language</a>, function in <a class="link" href="PopplerStructureElement.html" title="PopplerStructureElement">PopplerStructureElement</a> +</dt> +<dd></dd> +<dt> +<a class="link" href="PopplerStructureElement.html#poppler-structure-element-get-line-height" title="poppler_structure_element_get_line_height ()">poppler_structure_element_get_line_height</a>, function in <a class="link" href="PopplerStructureElement.html" title="PopplerStructureElement">PopplerStructureElement</a> +</dt> +<dd></dd> +<dt> +<a class="link" href="PopplerStructureElement.html#poppler-structure-element-get-list-numbering" title="poppler_structure_element_get_list_numbering ()">poppler_structure_element_get_list_numbering</a>, function in <a class="link" href="PopplerStructureElement.html" title="PopplerStructureElement">PopplerStructureElement</a> +</dt> +<dd></dd> +<dt> +<a class="link" href="PopplerStructureElement.html#poppler-structure-element-get-padding" title="poppler_structure_element_get_padding ()">poppler_structure_element_get_padding</a>, function in <a class="link" href="PopplerStructureElement.html" title="PopplerStructureElement">PopplerStructureElement</a> +</dt> +<dd></dd> +<dt> +<a class="link" href="PopplerStructureElement.html#poppler-structure-element-get-page" title="poppler_structure_element_get_page ()">poppler_structure_element_get_page</a>, function in <a class="link" href="PopplerStructureElement.html" title="PopplerStructureElement">PopplerStructureElement</a> +</dt> +<dd></dd> +<dt> +<a class="link" href="PopplerStructureElement.html#poppler-structure-element-get-placement" title="poppler_structure_element_get_placement ()">poppler_structure_element_get_placement</a>, function in <a class="link" href="PopplerStructureElement.html" title="PopplerStructureElement">PopplerStructureElement</a> +</dt> +<dd></dd> +<dt> +<a class="link" href="PopplerStructureElement.html#poppler-structure-element-get-ruby-align" title="poppler_structure_element_get_ruby_align ()">poppler_structure_element_get_ruby_align</a>, function in <a class="link" href="PopplerStructureElement.html" title="PopplerStructureElement">PopplerStructureElement</a> +</dt> +<dd></dd> +<dt> +<a class="link" href="PopplerStructureElement.html#poppler-structure-element-get-ruby-position" title="poppler_structure_element_get_ruby_position ()">poppler_structure_element_get_ruby_position</a>, function in <a class="link" href="PopplerStructureElement.html" title="PopplerStructureElement">PopplerStructureElement</a> +</dt> +<dd></dd> +<dt> +<a class="link" href="PopplerStructureElement.html#poppler-structure-element-get-space-after" title="poppler_structure_element_get_space_after ()">poppler_structure_element_get_space_after</a>, function in <a class="link" href="PopplerStructureElement.html" title="PopplerStructureElement">PopplerStructureElement</a> +</dt> +<dd></dd> +<dt> +<a class="link" href="PopplerStructureElement.html#poppler-structure-element-get-space-before" title="poppler_structure_element_get_space_before ()">poppler_structure_element_get_space_before</a>, function in <a class="link" href="PopplerStructureElement.html" title="PopplerStructureElement">PopplerStructureElement</a> +</dt> +<dd></dd> +<dt> +<a class="link" href="PopplerStructureElement.html#poppler-structure-element-get-start-indent" title="poppler_structure_element_get_start_indent ()">poppler_structure_element_get_start_indent</a>, function in <a class="link" href="PopplerStructureElement.html" title="PopplerStructureElement">PopplerStructureElement</a> +</dt> +<dd></dd> +<dt> +<a class="link" href="PopplerStructureElement.html#poppler-structure-element-get-table-border-style" title="poppler_structure_element_get_table_border_style ()">poppler_structure_element_get_table_border_style</a>, function in <a class="link" href="PopplerStructureElement.html" title="PopplerStructureElement">PopplerStructureElement</a> +</dt> +<dd></dd> +<dt> +<a class="link" href="PopplerStructureElement.html#poppler-structure-element-get-table-column-span" title="poppler_structure_element_get_table_column_span ()">poppler_structure_element_get_table_column_span</a>, function in <a class="link" href="PopplerStructureElement.html" title="PopplerStructureElement">PopplerStructureElement</a> +</dt> +<dd></dd> +<dt> +<a class="link" href="PopplerStructureElement.html#poppler-structure-element-get-table-headers" title="poppler_structure_element_get_table_headers ()">poppler_structure_element_get_table_headers</a>, function in <a class="link" href="PopplerStructureElement.html" title="PopplerStructureElement">PopplerStructureElement</a> +</dt> +<dd></dd> +<dt> +<a class="link" href="PopplerStructureElement.html#poppler-structure-element-get-table-padding" title="poppler_structure_element_get_table_padding ()">poppler_structure_element_get_table_padding</a>, function in <a class="link" href="PopplerStructureElement.html" title="PopplerStructureElement">PopplerStructureElement</a> +</dt> +<dd></dd> +<dt> +<a class="link" href="PopplerStructureElement.html#poppler-structure-element-get-table-row-span" title="poppler_structure_element_get_table_row_span ()">poppler_structure_element_get_table_row_span</a>, function in <a class="link" href="PopplerStructureElement.html" title="PopplerStructureElement">PopplerStructureElement</a> +</dt> +<dd></dd> +<dt> +<a class="link" href="PopplerStructureElement.html#poppler-structure-element-get-table-scope" title="poppler_structure_element_get_table_scope ()">poppler_structure_element_get_table_scope</a>, function in <a class="link" href="PopplerStructureElement.html" title="PopplerStructureElement">PopplerStructureElement</a> +</dt> +<dd></dd> +<dt> +<a class="link" href="PopplerStructureElement.html#poppler-structure-element-get-table-summary" title="poppler_structure_element_get_table_summary ()">poppler_structure_element_get_table_summary</a>, function in <a class="link" href="PopplerStructureElement.html" title="PopplerStructureElement">PopplerStructureElement</a> +</dt> +<dd></dd> +<dt> +<a class="link" href="PopplerStructureElement.html#poppler-structure-element-get-text" title="poppler_structure_element_get_text ()">poppler_structure_element_get_text</a>, function in <a class="link" href="PopplerStructureElement.html" title="PopplerStructureElement">PopplerStructureElement</a> +</dt> +<dd></dd> +<dt> +<a class="link" href="PopplerStructureElement.html#poppler-structure-element-get-text-align" title="poppler_structure_element_get_text_align ()">poppler_structure_element_get_text_align</a>, function in <a class="link" href="PopplerStructureElement.html" title="PopplerStructureElement">PopplerStructureElement</a> +</dt> +<dd></dd> +<dt> +<a class="link" href="PopplerStructureElement.html#poppler-structure-element-get-text-decoration-color" title="poppler_structure_element_get_text_decoration_color ()">poppler_structure_element_get_text_decoration_color</a>, function in <a class="link" href="PopplerStructureElement.html" title="PopplerStructureElement">PopplerStructureElement</a> +</dt> +<dd></dd> +<dt> +<a class="link" href="PopplerStructureElement.html#poppler-structure-element-get-text-decoration-thickness" title="poppler_structure_element_get_text_decoration_thickness ()">poppler_structure_element_get_text_decoration_thickness</a>, function in <a class="link" href="PopplerStructureElement.html" title="PopplerStructureElement">PopplerStructureElement</a> +</dt> +<dd></dd> +<dt> +<a class="link" href="PopplerStructureElement.html#poppler-structure-element-get-text-decoration-type" title="poppler_structure_element_get_text_decoration_type ()">poppler_structure_element_get_text_decoration_type</a>, function in <a class="link" href="PopplerStructureElement.html" title="PopplerStructureElement">PopplerStructureElement</a> +</dt> +<dd></dd> +<dt> +<a class="link" href="PopplerStructureElement.html#poppler-structure-element-get-text-indent" title="poppler_structure_element_get_text_indent ()">poppler_structure_element_get_text_indent</a>, function in <a class="link" href="PopplerStructureElement.html" title="PopplerStructureElement">PopplerStructureElement</a> +</dt> +<dd></dd> +<dt> +<a class="link" href="PopplerStructureElement.html#poppler-structure-element-get-text-spans" title="poppler_structure_element_get_text_spans ()">poppler_structure_element_get_text_spans</a>, function in <a class="link" href="PopplerStructureElement.html" title="PopplerStructureElement">PopplerStructureElement</a> +</dt> +<dd></dd> +<dt> +<a class="link" href="PopplerStructureElement.html#poppler-structure-element-get-title" title="poppler_structure_element_get_title ()">poppler_structure_element_get_title</a>, function in <a class="link" href="PopplerStructureElement.html" title="PopplerStructureElement">PopplerStructureElement</a> +</dt> +<dd></dd> +<dt> +<a class="link" href="PopplerStructureElement.html#poppler-structure-element-get-width" title="poppler_structure_element_get_width ()">poppler_structure_element_get_width</a>, function in <a class="link" href="PopplerStructureElement.html" title="PopplerStructureElement">PopplerStructureElement</a> +</dt> +<dd></dd> +<dt> +<a class="link" href="PopplerStructureElement.html#poppler-structure-element-get-writing-mode" title="poppler_structure_element_get_writing_mode ()">poppler_structure_element_get_writing_mode</a>, function in <a class="link" href="PopplerStructureElement.html" title="PopplerStructureElement">PopplerStructureElement</a> +</dt> +<dd></dd> +<dt> +<a class="link" href="PopplerStructureElement.html#poppler-structure-element-is-block" title="poppler_structure_element_is_block ()">poppler_structure_element_is_block</a>, function in <a class="link" href="PopplerStructureElement.html" title="PopplerStructureElement">PopplerStructureElement</a> +</dt> +<dd></dd> +<dt> +<a class="link" href="PopplerStructureElement.html#poppler-structure-element-is-content" title="poppler_structure_element_is_content ()">poppler_structure_element_is_content</a>, function in <a class="link" href="PopplerStructureElement.html" title="PopplerStructureElement">PopplerStructureElement</a> +</dt> +<dd></dd> +<dt> +<a class="link" href="PopplerStructureElement.html#poppler-structure-element-is-grouping" title="poppler_structure_element_is_grouping ()">poppler_structure_element_is_grouping</a>, function in <a class="link" href="PopplerStructureElement.html" title="PopplerStructureElement">PopplerStructureElement</a> +</dt> +<dd></dd> +<dt> +<a class="link" href="PopplerStructureElement.html#poppler-structure-element-is-inline" title="poppler_structure_element_is_inline ()">poppler_structure_element_is_inline</a>, function in <a class="link" href="PopplerStructureElement.html" title="PopplerStructureElement">PopplerStructureElement</a> +</dt> +<dd></dd> +<dt> +<a class="link" href="PopplerStructureElement.html#poppler-structure-element-iter-copy" title="poppler_structure_element_iter_copy ()">poppler_structure_element_iter_copy</a>, function in <a class="link" href="PopplerStructureElement.html" title="PopplerStructureElement">PopplerStructureElement</a> +</dt> +<dd></dd> +<dt> +<a class="link" href="PopplerStructureElement.html#poppler-structure-element-iter-free" title="poppler_structure_element_iter_free ()">poppler_structure_element_iter_free</a>, function in <a class="link" href="PopplerStructureElement.html" title="PopplerStructureElement">PopplerStructureElement</a> +</dt> +<dd></dd> +<dt> +<a class="link" href="PopplerStructureElement.html#poppler-structure-element-iter-get-child" title="poppler_structure_element_iter_get_child ()">poppler_structure_element_iter_get_child</a>, function in <a class="link" href="PopplerStructureElement.html" title="PopplerStructureElement">PopplerStructureElement</a> +</dt> +<dd></dd> +<dt> +<a class="link" href="PopplerStructureElement.html#poppler-structure-element-iter-get-element" title="poppler_structure_element_iter_get_element ()">poppler_structure_element_iter_get_element</a>, function in <a class="link" href="PopplerStructureElement.html" title="PopplerStructureElement">PopplerStructureElement</a> +</dt> +<dd></dd> +<dt> +<a class="link" href="PopplerStructureElement.html#poppler-structure-element-iter-new" title="poppler_structure_element_iter_new ()">poppler_structure_element_iter_new</a>, function in <a class="link" href="PopplerStructureElement.html" title="PopplerStructureElement">PopplerStructureElement</a> +</dt> +<dd></dd> +<dt> +<a class="link" href="PopplerStructureElement.html#poppler-structure-element-iter-next" title="poppler_structure_element_iter_next ()">poppler_structure_element_iter_next</a>, function in <a class="link" href="PopplerStructureElement.html" title="PopplerStructureElement">PopplerStructureElement</a> +</dt> +<dd></dd> +<a name="idxT"></a><h3 class="title">T</h3> +<dt> +<a class="link" href="PopplerStructureElement.html#poppler-text-span-copy" title="poppler_text_span_copy ()">poppler_text_span_copy</a>, function in <a class="link" href="PopplerStructureElement.html" title="PopplerStructureElement">PopplerStructureElement</a> +</dt> +<dd></dd> +<dt> +<a class="link" href="PopplerStructureElement.html#poppler-text-span-free" title="poppler_text_span_free ()">poppler_text_span_free</a>, function in <a class="link" href="PopplerStructureElement.html" title="PopplerStructureElement">PopplerStructureElement</a> +</dt> +<dd></dd> +<dt> +<a class="link" href="PopplerStructureElement.html#poppler-text-span-get-color" title="poppler_text_span_get_color ()">poppler_text_span_get_color</a>, function in <a class="link" href="PopplerStructureElement.html" title="PopplerStructureElement">PopplerStructureElement</a> +</dt> +<dd></dd> +<dt> +<a class="link" href="PopplerStructureElement.html#poppler-text-span-get-font-name" title="poppler_text_span_get_font_name ()">poppler_text_span_get_font_name</a>, function in <a class="link" href="PopplerStructureElement.html" title="PopplerStructureElement">PopplerStructureElement</a> +</dt> +<dd></dd> +<dt> +<a class="link" href="PopplerStructureElement.html#poppler-text-span-get-text" title="poppler_text_span_get_text ()">poppler_text_span_get_text</a>, function in <a class="link" href="PopplerStructureElement.html" title="PopplerStructureElement">PopplerStructureElement</a> +</dt> +<dd></dd> +<dt> +<a class="link" href="PopplerStructureElement.html#poppler-text-span-is-bold-font" title="poppler_text_span_is_bold_font ()">poppler_text_span_is_bold_font</a>, function in <a class="link" href="PopplerStructureElement.html" title="PopplerStructureElement">PopplerStructureElement</a> +</dt> +<dd></dd> +<dt> +<a class="link" href="PopplerStructureElement.html#poppler-text-span-is-fixed-width-font" title="poppler_text_span_is_fixed_width_font ()">poppler_text_span_is_fixed_width_font</a>, function in <a class="link" href="PopplerStructureElement.html" title="PopplerStructureElement">PopplerStructureElement</a> +</dt> +<dd></dd> +<dt> +<a class="link" href="PopplerStructureElement.html#poppler-text-span-is-serif-font" title="poppler_text_span_is_serif_font ()">poppler_text_span_is_serif_font</a>, function in <a class="link" href="PopplerStructureElement.html" title="PopplerStructureElement">PopplerStructureElement</a> +</dt> +<dd></dd> +</div> +<div class="footer"> +<hr> + Generated by GTK-Doc V1.21</div> +</body> +</html> \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.33.0/glib/reference/html/api-index-0-33.html new/poppler-0.34.0/glib/reference/html/api-index-0-33.html --- old/poppler-0.33.0/glib/reference/html/api-index-0-33.html 1970-01-01 01:00:00.000000000 +0100 +++ new/poppler-0.34.0/glib/reference/html/api-index-0-33.html 2015-07-08 22:27:42.000000000 +0200 @@ -0,0 +1,35 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<html> +<head> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> +<title>Poppler Reference Manual: Index of new symbols in 0.33</title> +<meta name="generator" content="DocBook XSL Stylesheets V1.78.1"> +<link rel="home" href="index.html" title="Poppler Reference Manual"> +<link rel="up" href="index.html" title="Poppler Reference Manual"> +<link rel="prev" href="api-index-0-26.html" title="Index of new symbols in 0.26"> +<link rel="next" href="annotation-glossary.html" title="Annotation Glossary"> +<meta name="generator" content="GTK-Doc V1.21 (XML mode)"> +<link rel="stylesheet" href="style.css" type="text/css"> +</head> +<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> +<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle"> +<td width="100%" align="left" class="shortcuts"><span id="nav_index"><a class="shortcut" href="#idxA">A</a></span></td> +<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td> +<td><img src="up-insensitive.png" width="16" height="16" border="0"></td> +<td><a accesskey="p" href="api-index-0-26.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td> +<td><a accesskey="n" href="annotation-glossary.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td> +</tr></table> +<div class="index"> +<div class="titlepage"><div><div><h1 class="title"> +<a name="api-index-0-33"></a>Index of new symbols in 0.33</h1></div></div></div> +<a name="idx"></a><a name="idxA"></a><h3 class="title">A</h3> +<dt> +<a class="link" href="PopplerAnnot.html#poppler-annot-markup-set-popup-rectangle" title="poppler_annot_markup_set_popup_rectangle ()">poppler_annot_markup_set_popup_rectangle</a>, function in <a class="link" href="PopplerAnnot.html" title="PopplerAnnot">PopplerAnnot</a> +</dt> +<dd></dd> +</div> +<div class="footer"> +<hr> + Generated by GTK-Doc V1.21</div> +</body> +</html> \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.33.0/glib/reference/html/api-index-full.html new/poppler-0.34.0/glib/reference/html/api-index-full.html --- old/poppler-0.33.0/glib/reference/html/api-index-full.html 2015-05-14 21:48:34.000000000 +0200 +++ new/poppler-0.34.0/glib/reference/html/api-index-full.html 2015-07-08 22:27:42.000000000 +0200 @@ -730,11 +730,11 @@ <dd></dd> <a name="idxE"></a><h3 class="title">E</h3> <dt> -<a class="link" href="poppler-poppler.html#POPPLER-ERROR:CAPS" title="POPPLER_ERROR">POPPLER_ERROR</a>, macro in <a class="link" href="poppler-poppler.html" title="poppler">poppler</a> +<a class="link" href="poppler-poppler.html#PopplerError" title="enum PopplerError">PopplerError</a>, enum in <a class="link" href="poppler-poppler.html" title="poppler">poppler</a> </dt> <dd></dd> <dt> -<a class="link" href="poppler-poppler.html#PopplerError" title="enum PopplerError">PopplerError</a>, enum in <a class="link" href="poppler-poppler.html" title="poppler">poppler</a> +<a class="link" href="poppler-poppler.html#POPPLER-ERROR:CAPS" title="POPPLER_ERROR">POPPLER_ERROR</a>, macro in <a class="link" href="poppler-poppler.html" title="poppler">poppler</a> </dt> <dd></dd> <a name="idxF"></a><h3 class="title">F</h3> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.33.0/glib/reference/html/index.html new/poppler-0.34.0/glib/reference/html/index.html --- old/poppler-0.33.0/glib/reference/html/index.html 2015-05-14 21:48:34.000000000 +0200 +++ new/poppler-0.34.0/glib/reference/html/index.html 2015-07-08 22:27:42.000000000 +0200 @@ -15,7 +15,7 @@ <div> <div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">Poppler Reference Manual</p></th></tr></table></div> <div><p class="releaseinfo"> - for Poppler 0.33.0 + for Poppler 0.34.0 </p></div> </div> @@ -75,6 +75,8 @@ <dt><span class="index"><a href="api-index-0-18.html">Index of new symbols in 0.18</a></span></dt> <dt><span class="index"><a href="api-index-0-20.html">Index of new symbols in 0.20</a></span></dt> <dt><span class="index"><a href="api-index-0-22.html">Index of new symbols in 0.22</a></span></dt> +<dt><span class="index"><a href="api-index-0-26.html">Index of new symbols in 0.26</a></span></dt> +<dt><span class="index"><a href="api-index-0-33.html">Index of new symbols in 0.33</a></span></dt> <dt><span class="glossary"><a href="annotation-glossary.html">Annotation Glossary</a></span></dt> </dl></div> </div> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.33.0/glib/reference/html/poppler-Version-and-Features-Information.html new/poppler-0.34.0/glib/reference/html/poppler-Version-and-Features-Information.html --- old/poppler-0.33.0/glib/reference/html/poppler-Version-and-Features-Information.html 2015-05-14 21:48:34.000000000 +0200 +++ new/poppler-0.34.0/glib/reference/html/poppler-Version-and-Features-Information.html 2015-07-08 22:27:42.000000000 +0200 @@ -119,7 +119,7 @@ <hr> <div class="refsect2"> <a name="POPPLER-MINOR-VERSION:CAPS"></a><h3>POPPLER_MINOR_VERSION</h3> -<pre class="programlisting">#define POPPLER_MINOR_VERSION (33) +<pre class="programlisting">#define POPPLER_MINOR_VERSION (34) </pre> <p>The major version number of the poppler header files (e.g. in poppler version 0.1.2 this is 1.)</p> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.33.0/glib/reference/html/poppler.devhelp2 new/poppler-0.34.0/glib/reference/html/poppler.devhelp2 --- old/poppler-0.33.0/glib/reference/html/poppler.devhelp2 2015-05-14 21:48:34.000000000 +0200 +++ new/poppler-0.34.0/glib/reference/html/poppler.devhelp2 2015-07-08 22:27:42.000000000 +0200 @@ -26,6 +26,8 @@ <sub name="Index of new symbols in 0.18" link="api-index-0-18.html"/> <sub name="Index of new symbols in 0.20" link="api-index-0-20.html"/> <sub name="Index of new symbols in 0.22" link="api-index-0-22.html"/> + <sub name="Index of new symbols in 0.26" link="api-index-0-26.html"/> + <sub name="Index of new symbols in 0.33" link="api-index-0-33.html"/> <sub name="Annotation Glossary" link="annotation-glossary.html"/> </chapters> <functions> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.33.0/glib/reference/poppler-docs.sgml new/poppler-0.34.0/glib/reference/poppler-docs.sgml --- old/poppler-0.33.0/glib/reference/poppler-docs.sgml 2014-06-18 00:34:38.000000000 +0200 +++ new/poppler-0.34.0/glib/reference/poppler-docs.sgml 2015-05-24 18:39:36.000000000 +0200 @@ -61,6 +61,14 @@ <title>Index of new symbols in 0.22</title> <xi:include href="xml/api-index-0.22.xml"><xi:fallback /></xi:include> </index> + <index id="api-index-0-26"> + <title>Index of new symbols in 0.26</title> + <xi:include href="xml/api-index-0.26.xml"><xi:fallback /></xi:include> + </index> + <index id="api-index-0-33"> + <title>Index of new symbols in 0.33</title> + <xi:include href="xml/api-index-0.33.xml"><xi:fallback /></xi:include> + </index> <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include> </book> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.33.0/glib/reference/version.xml new/poppler-0.34.0/glib/reference/version.xml --- old/poppler-0.33.0/glib/reference/version.xml 2015-05-14 20:26:23.000000000 +0200 +++ new/poppler-0.34.0/glib/reference/version.xml 2015-07-08 22:17:23.000000000 +0200 @@ -1 +1 @@ -0.33.0 +0.34.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.33.0/poppler/Annot.cc new/poppler-0.34.0/poppler/Annot.cc --- old/poppler-0.33.0/poppler/Annot.cc 2015-05-14 20:16:01.000000000 +0200 +++ new/poppler-0.34.0/poppler/Annot.cc 2015-07-03 20:23:25.000000000 +0200 @@ -34,6 +34,7 @@ // Copyright (C) 2014 Anuj Khare <khareanuj18@gmail.com> // Copyright (C) 2015 Petr Gajdos <pgajdos@suse.cz> // Copyright (C) 2015 Philipp Reinkemeier <philipp.reinkemeier@offis.de> +// Copyright (C) 2015 Tamas Szekeres <szekerest@gmail.com> // // To see a description of the changes please see the Changelog file that // came with your tarball or type make ChangeLog if you are building from git @@ -73,6 +74,7 @@ #include "DateInfo.h" #include "Link.h" #include <string.h> +#include <algorithm> #if MULTITHREADED # define annotLocker() MutexLocker locker(&mutex) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.33.0/poppler/Makefile.am new/poppler-0.34.0/poppler/Makefile.am --- old/poppler-0.33.0/poppler/Makefile.am 2015-05-14 20:22:51.000000000 +0200 +++ new/poppler-0.34.0/poppler/Makefile.am 2015-07-08 22:15:10.000000000 +0200 @@ -296,7 +296,7 @@ $(win32_libs) libpoppler_la_LDFLAGS = \ - -version-info 52:0:0 \ + -version-info 53:0:0 \ @create_shared_lib@ \ @auto_import_flags@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.33.0/poppler/Makefile.in new/poppler-0.34.0/poppler/Makefile.in --- old/poppler-0.33.0/poppler/Makefile.in 2015-05-14 20:26:15.000000000 +0200 +++ new/poppler-0.34.0/poppler/Makefile.in 2015-07-08 22:17:18.000000000 +0200 @@ -794,7 +794,7 @@ $(win32_libs) libpoppler_la_LDFLAGS = \ - -version-info 52:0:0 \ + -version-info 53:0:0 \ @create_shared_lib@ \ @auto_import_flags@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.33.0/poppler/PSOutputDev.cc new/poppler-0.34.0/poppler/PSOutputDev.cc --- old/poppler-0.33.0/poppler/PSOutputDev.cc 2015-05-14 19:59:17.000000000 +0200 +++ new/poppler-0.34.0/poppler/PSOutputDev.cc 2015-07-03 20:18:58.000000000 +0200 @@ -29,6 +29,7 @@ // Copyright (C) 2012, 2014 Fabio D'Urso <fabiodurso@hotmail.it> // Copyright (C) 2012 Lu Wang <coolwanglu@gmail.com> // Copyright (C) 2014 Till Kamppeter <till.kamppeter@gmail.com> +// Copyright (C) 2015 Marek Kasik <mkasik@redhat.com> // // To see a description of the changes please see the Changelog file that // came with your tarball or type make ChangeLog if you are building from git @@ -2122,7 +2123,7 @@ static const char hexChar[17] = "0123456789abcdef"; Object refObj, strObj, obj1, obj2, obj3; Dict *dict; - int length1, length2, length3; + long length1, length2, length3; int c; int start[4]; GBool binMode; @@ -2172,8 +2173,18 @@ embFontList->append(psName->getCString()); embFontList->append("\n"); - // copy ASCII portion of font strObj.streamReset(); + if (strObj.streamGetChar() == 0x80 && + strObj.streamGetChar() == 1) { + // PFB format + length1 = strObj.streamGetChar() | + (strObj.streamGetChar() << 8) | + (strObj.streamGetChar() << 16) | + (strObj.streamGetChar() << 24); + } else { + strObj.streamReset(); + } + // copy ASCII portion of font for (i = 0; i < length1 && (c = strObj.streamGetChar()) != EOF; ++i) { writePSChar(c); } @@ -2206,9 +2217,18 @@ // convert binary data to ASCII if (binMode) { - for (i = 0; i < 4; ++i) { - writePSChar(hexChar[(start[i] >> 4) & 0x0f]); - writePSChar(hexChar[start[i] & 0x0f]); + if (start[0] == 0x80 && + start[1] == 2) { + length2 = start[2] | + (start[3] << 8) | + (strObj.streamGetChar() << 16) | + (strObj.streamGetChar() << 24); + i = 0; + } else { + for (i = 0; i < 4; ++i) { + writePSChar(hexChar[(start[i] >> 4) & 0x0f]); + writePSChar(hexChar[start[i] & 0x0f]); + } } #if 0 // this causes trouble for various PostScript printers // if Length2 is incorrect (too small), font data gets chopped, so @@ -2246,8 +2266,32 @@ { if (length3 > 0) { // write fixed-content portion - while ((c = strObj.streamGetChar()) != EOF) { - writePSChar(c); + c = strObj.streamGetChar(); + if (c == 0x80) { + c = strObj.streamGetChar(); + if (c == 1) { + length3 = strObj.streamGetChar() | + (strObj.streamGetChar() << 8) | + (strObj.streamGetChar() << 16) | + (strObj.streamGetChar() << 24); + + i = 0; + while (i < length3) { + if ((c = strObj.streamGetChar()) == EOF) { + break; + } + writePSChar(c); + ++i; + } + } + } else { + if (c != EOF) { + writePSChar(c); + + while ((c = strObj.streamGetChar()) != EOF) { + writePSChar(c); + } + } } } else { // write padding and "cleartomark" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.33.0/poppler/SplashOutputDev.cc new/poppler-0.34.0/poppler/SplashOutputDev.cc --- old/poppler-0.33.0/poppler/SplashOutputDev.cc 2015-04-29 01:15:22.000000000 +0200 +++ new/poppler-0.34.0/poppler/SplashOutputDev.cc 2015-07-06 21:57:04.000000000 +0200 @@ -34,6 +34,7 @@ // Copyright (C) 2013 Li Junling <lijunling@sina.com> // Copyright (C) 2014 Ed Porras <ed@moto-research.com> // Copyright (C) 2014 Richard PALO <richard@netbsd.org> +// Copyright (C) 2015 Tamas Szekeres <szekerest@gmail.com> // // To see a description of the changes please see the Changelog file that // came with your tarball or type make ChangeLog if you are building from git @@ -72,6 +73,7 @@ #include "splash/SplashFontFileID.h" #include "splash/Splash.h" #include "SplashOutputDev.h" +#include <algorithm> #ifdef VMS #if (__VMS_VER < 70000000) @@ -1227,6 +1229,7 @@ struct SplashTransparencyGroup { int tx, ty; // translation coordinates SplashBitmap *tBitmap; // bitmap for transparency group + SplashBitmap *softmask; // bitmap for softmasks GfxColorSpace *blendingColorSpace; GBool isolated; @@ -2778,8 +2781,8 @@ imgMaskData.height = height; imgMaskData.y = 0; - maskBitmap = new SplashBitmap(bitmap->getWidth(), bitmap->getHeight(), 1, splashModeMono8, gFalse); - maskSplash = new Splash(maskBitmap, vectorAntialias); + transpGroupStack->softmask = new SplashBitmap(bitmap->getWidth(), bitmap->getHeight(), 1, splashModeMono8, gFalse); + maskSplash = new Splash(transpGroupStack->softmask, vectorAntialias); maskColor[0] = 0; maskSplash->clear(maskColor); maskColor[0] = 0xff; @@ -2796,13 +2799,15 @@ /* transfer mask to alpha channel! */ // memcpy(maskBitmap->getAlphaPtr(), maskBitmap->getDataPtr(), bitmap->getRowSize() * bitmap->getHeight()); // memset(maskBitmap->getDataPtr(), 0, bitmap->getRowSize() * bitmap->getHeight()); - Guchar *dest = bitmap->getAlphaPtr(); - Guchar *src = maskBitmap->getDataPtr(); - for (int c= 0; c < maskBitmap->getRowSize() * maskBitmap->getHeight(); c++) { - dest[c] = src[c]; + if (transpGroupStack->softmask != NULL) { + Guchar *dest = bitmap->getAlphaPtr(); + Guchar *src = transpGroupStack->softmask->getDataPtr(); + for (int c= 0; c < transpGroupStack->softmask->getRowSize() * transpGroupStack->softmask->getHeight(); c++) { + dest[c] = src[c]; + } + delete transpGroupStack->softmask; + transpGroupStack->softmask = NULL; } - delete maskBitmap; - maskBitmap = NULL; endTransparencyGroup(state); baseMatrix[4] += transpGroupStack->tx; baseMatrix[5] += transpGroupStack->ty; @@ -2818,6 +2823,37 @@ int width, height, y; }; +#ifdef USE_CMS +GBool SplashOutputDev::useIccImageSrc(void *data) { + SplashOutImageData *imgData = (SplashOutImageData *)data; + + if (!imgData->lookup && imgData->colorMap->getColorSpace()->getMode() == csICCBased) { + GfxICCBasedColorSpace *colorSpace = (GfxICCBasedColorSpace *) imgData->colorMap->getColorSpace(); + switch (imgData->colorMode) { + case splashModeMono1: + case splashModeMono8: + if (colorSpace->getAlt() != NULL && colorSpace->getAlt()->getMode() == csDeviceGray) + return gTrue; + break; + case splashModeXBGR8: + case splashModeRGB8: + case splashModeBGR8: + if (colorSpace->getAlt() != NULL && colorSpace->getAlt()->getMode() == csDeviceRGB) + return gTrue; + break; +#if SPLASH_CMYK + case splashModeCMYK8: + if (colorSpace->getAlt() != NULL && colorSpace->getAlt()->getMode() == csDeviceCMYK) + return gTrue; + break; +#endif + } + } + + return gFalse; +} +#endif + GBool SplashOutputDev::imageSrc(void *data, SplashColorPtr colorLine, Guchar * /*alphaLine*/) { SplashOutImageData *imgData = (SplashOutImageData *)data; @@ -2965,6 +3001,100 @@ return gTrue; } +#ifdef USE_CMS +GBool SplashOutputDev::iccImageSrc(void *data, SplashColorPtr colorLine, + Guchar * /*alphaLine*/) { + SplashOutImageData *imgData = (SplashOutImageData *)data; + Guchar *p; + int nComps; + + if (imgData->y == imgData->height) { + return gFalse; + } + if (!(p = imgData->imgStr->getLine())) { + int destComps = 1; + if (imgData->colorMode == splashModeRGB8 || imgData->colorMode == splashModeBGR8) + destComps = 3; + else if (imgData->colorMode == splashModeXBGR8) + destComps = 4; +#if SPLASH_CMYK + else if (imgData->colorMode == splashModeCMYK8) + destComps = 4; + else if (imgData->colorMode == splashModeDeviceN8) + destComps = SPOT_NCOMPS + 4; +#endif + memset(colorLine, 0, imgData->width * destComps); + return gFalse; + } + + if (imgData->colorMode == splashModeXBGR8) { + SplashColorPtr q; + int x; + for (x = 0, q = colorLine; x < imgData->width; ++x) { + *q++ = *p++; + *q++ = *p++; + *q++ = *p++; + *q++ = 255; + } + } else { + nComps = imgData->colorMap->getNumPixelComps(); + memcpy(colorLine, p, imgData->width * nComps); + } + + ++imgData->y; + return gTrue; +} + +void SplashOutputDev::iccTransform(void *data, SplashBitmap *bitmap) { + SplashOutImageData *imgData = (SplashOutImageData *)data; + int nComps = imgData->colorMap->getNumPixelComps(); + + Guchar *colorLine = (Guchar *) gmalloc(nComps * bitmap->getWidth()); + Guchar *rgbxLine = (imgData->colorMode == splashModeXBGR8) ? (Guchar *) gmalloc(3 * bitmap->getWidth()) : NULL; + for (int i = 0; i < bitmap->getHeight(); i++) { + Guchar *p = bitmap->getDataPtr() + i * bitmap->getRowSize(); + switch (imgData->colorMode) { + case splashModeMono1: + case splashModeMono8: + imgData->colorMap->getGrayLine(p, colorLine, bitmap->getWidth()); + memcpy(p, colorLine, nComps * bitmap->getWidth()); + break; + case splashModeRGB8: + case splashModeBGR8: + imgData->colorMap->getRGBLine(p, colorLine, bitmap->getWidth()); + memcpy(p, colorLine, nComps * bitmap->getWidth()); + break; +#if SPLASH_CMYK + case splashModeCMYK8: + imgData->colorMap->getCMYKLine(p, colorLine, bitmap->getWidth()); + memcpy(p, colorLine, nComps * bitmap->getWidth()); + break; +#endif + case splashModeXBGR8: + Guchar *q; + Guchar *b = p; + int x; + for (x = 0, q = rgbxLine; x < bitmap->getWidth(); ++x, ++b) { + *q++ = *b++; + *q++ = *b++; + *q++ = *b++; + } + imgData->colorMap->getRGBLine(rgbxLine, colorLine, bitmap->getWidth()); + b = p; + for (x = 0, q = colorLine; x < bitmap->getWidth(); ++x, ++b) { + *b++ = *q++; + *b++ = *q++; + *b++ = *q++; + } + break; + } + } + gfree(colorLine); + if (rgbxLine != NULL) + gfree(rgbxLine); +} +#endif + GBool SplashOutputDev::alphaImageSrc(void *data, SplashColorPtr colorLine, Guchar *alphaLine) { SplashOutImageData *imgData = (SplashOutImageData *)data; @@ -3176,6 +3306,7 @@ SplashOutImageData imgData; SplashColorMode srcMode; SplashImageSource src; + SplashICCTransform tf; GfxGray gray; GfxRGB rgb; #if SPLASH_CMYK @@ -3293,8 +3424,14 @@ } else { srcMode = colorMode; } +#ifdef USE_CMS + src = maskColors ? &alphaImageSrc : useIccImageSrc(&imgData) ? &iccImageSrc : &imageSrc; + tf = maskColors == NULL && useIccImageSrc(&imgData) ? &iccTransform : NULL; +#else src = maskColors ? &alphaImageSrc : &imageSrc; - splash->drawImage(src, &imgData, srcMode, maskColors ? gTrue : gFalse, + tf = NULL; +#endif + splash->drawImage(src, tf, &imgData, srcMode, maskColors ? gTrue : gFalse, width, height, mat, interpolate); if (inlineImg) { while (imgData.y < height) { @@ -3596,7 +3733,7 @@ } else { srcMode = colorMode; } - splash->drawImage(&maskedImageSrc, &imgData, srcMode, gTrue, + splash->drawImage(&maskedImageSrc, NULL, &imgData, srcMode, gTrue, width, height, mat, interpolate); delete maskBitmap; gfree(imgData.lookup); @@ -3671,7 +3808,7 @@ maskSplash = new Splash(maskBitmap, vectorAntialias); maskColor[0] = 0; maskSplash->clear(maskColor); - maskSplash->drawImage(&imageSrc, &imgMaskData, splashModeMono8, gFalse, + maskSplash->drawImage(&imageSrc, NULL, &imgMaskData, splashModeMono8, gFalse, maskWidth, maskHeight, mat, maskInterpolate); delete imgMaskData.imgStr; maskStr->close(); @@ -3759,7 +3896,7 @@ } else { srcMode = colorMode; } - splash->drawImage(&imageSrc, &imgData, srcMode, gFalse, width, height, mat, interpolate); + splash->drawImage(&imageSrc, NULL, &imgData, srcMode, gFalse, width, height, mat, interpolate); splash->setSoftMask(NULL); gfree(imgData.lookup); delete imgData.imgStr; @@ -3852,6 +3989,7 @@ // push a new stack entry transpGroup = new SplashTransparencyGroup(); + transpGroup->softmask = NULL; transpGroup->tx = tx; transpGroup->ty = ty; transpGroup->blendingColorSpace = blendingColorSpace; @@ -4358,7 +4496,7 @@ } retValue = gTrue; } else { - retValue = splash->drawImage(&tilingBitmapSrc, &imgData, colorMode, gTrue, result_width, result_height, matc, gFalse, gTrue) == splashOk; + retValue = splash->drawImage(&tilingBitmapSrc, NULL, &imgData, colorMode, gTrue, result_width, result_height, matc, gFalse, gTrue) == splashOk; } delete tBitmap; delete gfx; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.33.0/poppler/SplashOutputDev.h new/poppler-0.34.0/poppler/SplashOutputDev.h --- old/poppler-0.33.0/poppler/SplashOutputDev.h 2015-04-29 01:15:22.000000000 +0200 +++ new/poppler-0.34.0/poppler/SplashOutputDev.h 2015-05-24 18:41:19.000000000 +0200 @@ -14,7 +14,7 @@ // under GPL version 2 or later // // Copyright (C) 2005 Takashi Iwai <tiwai@suse.de> -// Copyright (C) 2009-2014 Thomas Freitag <Thomas.Freitag@alfa.de> +// Copyright (C) 2009-2015 Thomas Freitag <Thomas.Freitag@alfa.de> // Copyright (C) 2009 Carlos Garcia Campos <carlosgc@gnome.org> // Copyright (C) 2010 Christian Feuers�nger <cfeuersaenger@googlemail.com> // Copyright (C) 2011 Andreas Hartmetz <ahartmetz@gmail.com> @@ -383,6 +383,12 @@ GBool dropEmptySubpaths); void drawType3Glyph(GfxState *state, T3FontCache *t3Font, T3FontCacheTag *tag, Guchar *data); +#ifdef USE_CMS + GBool useIccImageSrc(void *data); + static void iccTransform(void *data, SplashBitmap *bitmap); + static GBool iccImageSrc(void *data, SplashColorPtr colorLine, + Guchar *alphaLine); +#endif static GBool imageMaskSrc(void *data, SplashColorPtr line); static GBool imageSrc(void *data, SplashColorPtr colorLine, Guchar *alphaLine); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.33.0/poppler/StructElement.cc new/poppler-0.34.0/poppler/StructElement.cc --- old/poppler-0.33.0/poppler/StructElement.cc 2014-10-07 22:44:02.000000000 +0200 +++ new/poppler-0.34.0/poppler/StructElement.cc 2015-07-06 00:28:17.000000000 +0200 @@ -7,6 +7,7 @@ // Copyright 2013, 2014 Igalia S.L. // Copyright 2014 Luigi Scarso <luigi.scarso@gmail.com> // Copyright 2014 Albert Astals Cid <aacid@kde.org> +// Copyright 2015 Dmytro Morgun <lztoad@gmail.com> // //======================================================================== @@ -279,6 +280,20 @@ Before.initName("Before"); Nat1.initInt(1); } + + ~AttributeDefaults() { + Inline.free(); + LrTb.free(); + Normal.free(); + Distribute.free(); + off.free(); + Zero.free(); + Auto.free(); + Start.free(); + None.free(); + Before.free(); + Nat1.free(); + } }; static const AttributeDefaults attributeDefaults; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.33.0/splash/Splash.cc new/poppler-0.34.0/splash/Splash.cc --- old/poppler-0.33.0/splash/Splash.cc 2015-04-29 01:15:22.000000000 +0200 +++ new/poppler-0.34.0/splash/Splash.cc 2015-05-24 18:40:59.000000000 +0200 @@ -13,7 +13,7 @@ // // Copyright (C) 2005-2015 Albert Astals Cid <aacid@kde.org> // Copyright (C) 2005 Marco Pesenti Gritti <mpg@redhat.com> -// Copyright (C) 2010-2014 Thomas Freitag <Thomas.Freitag@alfa.de> +// Copyright (C) 2010-2015 Thomas Freitag <Thomas.Freitag@alfa.de> // Copyright (C) 2010 Christian Feuersänger <cfeuersaenger@googlemail.com> // Copyright (C) 2011-2013, 2015 William Bader <williambader@hotmail.com> // Copyright (C) 2012 Markus Trippelsdorf <markus@trippelsdorf.de> @@ -3659,7 +3659,7 @@ } } -SplashError Splash::drawImage(SplashImageSource src, void *srcData, +SplashError Splash::drawImage(SplashImageSource src, SplashICCTransform tf, void *srcData, SplashColorMode srcMode, GBool srcAlpha, int w, int h, SplashCoord *mat, GBool interpolate, GBool tilingPattern) { @@ -3750,6 +3750,9 @@ if (scaledImg == NULL) { return splashErrBadArg; } + if (tf != NULL) { + (*tf)(srcData, scaledImg); + } blitImage(scaledImg, srcAlpha, x0, y0, clipRes); delete scaledImg; } @@ -3788,6 +3791,9 @@ if (scaledImg == NULL) { return splashErrBadArg; } + if (tf != NULL) { + (*tf)(srcData, scaledImg); + } vertFlipImage(scaledImg, scaledWidth, scaledHeight, nComps); blitImage(scaledImg, srcAlpha, x0, y0, clipRes); delete scaledImg; @@ -3795,14 +3801,14 @@ // all other cases } else { - return arbitraryTransformImage(src, srcData, srcMode, nComps, srcAlpha, + return arbitraryTransformImage(src, tf, srcData, srcMode, nComps, srcAlpha, w, h, mat, interpolate, tilingPattern); } return splashOk; } -SplashError Splash::arbitraryTransformImage(SplashImageSource src, void *srcData, +SplashError Splash::arbitraryTransformImage(SplashImageSource src, SplashICCTransform tf, void *srcData, SplashColorMode srcMode, int nComps, GBool srcAlpha, int srcWidth, int srcHeight, @@ -3937,6 +3943,9 @@ return splashErrBadArg; } + if (tf != NULL) { + (*tf)(srcData, scaledImg); + } // construct the three sections i = 0; if (vy[1] < vy[i]) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.33.0/splash/Splash.h new/poppler-0.34.0/splash/Splash.h --- old/poppler-0.33.0/splash/Splash.h 2015-04-29 01:15:22.000000000 +0200 +++ new/poppler-0.34.0/splash/Splash.h 2015-05-24 18:40:50.000000000 +0200 @@ -13,7 +13,7 @@ // // Copyright (C) 2005 Marco Pesenti Gritti <mpg@redhat.com> // Copyright (C) 2007, 2011 Albert Astals Cid <aacid@kde.org> -// Copyright (C) 2010-2013 Thomas Freitag <Thomas.Freitag@alfa.de> +// Copyright (C) 2010-2013, 2015 Thomas Freitag <Thomas.Freitag@alfa.de> // Copyright (C) 2010 Christian Feuers�nger <cfeuersaenger@googlemail.com> // Copyright (C) 2012 Adrian Johnson <ajohnson@redneon.com> // @@ -56,6 +56,9 @@ typedef GBool (*SplashImageSource)(void *data, SplashColorPtr colorLine, Guchar *alphaLine); +// Use ICCColorSpace to transform a bitmap +typedef void (*SplashICCTransform)(void *data, SplashBitmap *bitmap); + //------------------------------------------------------------------------ enum SplashPipeResultColorCtrl { @@ -211,7 +214,7 @@ // BGR8 BGR8 // CMYK8 CMYK8 // The matrix behaves as for fillImageMask. - SplashError drawImage(SplashImageSource src, void *srcData, + SplashError drawImage(SplashImageSource src, SplashICCTransform tf, void *srcData, SplashColorMode srcMode, GBool srcAlpha, int w, int h, SplashCoord *mat, GBool interpolate, GBool tilingPattern = gFalse); @@ -357,7 +360,7 @@ SplashBitmap *dest); void blitMask(SplashBitmap *src, int xDest, int yDest, SplashClipResult clipRes); - SplashError arbitraryTransformImage(SplashImageSource src, void *srcData, + SplashError arbitraryTransformImage(SplashImageSource src, SplashICCTransform tf, void *srcData, SplashColorMode srcMode, int nComps, GBool srcAlpha, int srcWidth, int srcHeight,
participants (1)
-
root@hilbert.suse.de