poppler/Form.h | 2 ++ qt5/src/ArthurOutputDev.h | 2 +- qt5/src/poppler-annotation.h | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-)
New commits: commit 2baaa02087ef66b97bf3c4bce49785a10632178f Author: Albert Astals Cid <[email protected]> Date: Sun Aug 13 12:35:39 2017 +0200 Revert part of last commit, we wants tests not to fail :) diff --git a/qt5/tests/check_metadata.cpp b/qt5/tests/check_metadata.cpp index 21262a11..05abbaf4 100644 --- a/qt5/tests/check_metadata.cpp +++ b/qt5/tests/check_metadata.cpp @@ -33,7 +33,7 @@ void TestMetaData::checkStrings_data() QTest::newRow( "Title" ) << "Title" << "Two pages"; QTest::newRow( "Subject" ) << "Subject" << "A two page layout for poppler testing"; - QTest::newRow( "Keywords" ) << "Keywords" << "Qt5 bindings"; + QTest::newRow( "Keywords" ) << "Keywords" << "Qt4 bindings"; QTest::newRow( "Creator" ) << "Creator" << "iText: cgpdftops CUPS filter"; QTest::newRow( "Producer" ) << "Producer" << "Acrobat Distiller 7.0 for Macintosh"; } commit 3af2e18fc31f18efb36408281ca5879f284edaa4 Author: Oliver Sander <[email protected]> Date: Fri Aug 11 22:55:41 2017 +0200 Fix copy'n'paste bugs: Qt4 -> Qt5 diff --git a/qt5/src/ArthurOutputDev.h b/qt5/src/ArthurOutputDev.h index 61ec9290..20723b70 100644 --- a/qt5/src/ArthurOutputDev.h +++ b/qt5/src/ArthurOutputDev.h @@ -48,7 +48,7 @@ class SplashFontEngine; struct SplashGlyphBitmap; //------------------------------------------------------------------------ -// ArthurOutputDev - Qt 4 QPainter renderer +// ArthurOutputDev - Qt 5 QPainter renderer //------------------------------------------------------------------------ class ArthurOutputDev: public OutputDev { diff --git a/qt5/src/poppler-annotation.h b/qt5/src/poppler-annotation.h index bf113909..a70cbe4f 100644 --- a/qt5/src/poppler-annotation.h +++ b/qt5/src/poppler-annotation.h @@ -154,7 +154,7 @@ class POPPLER_QT5_EXPORT AnnotationUtils * annotations are always positioned as if they were being positioned at the * default page orientation. * - * Just like regular annotations, %Poppler Qt4 exposes normalized coordinates + * Just like regular annotations, %Poppler Qt5 exposes normalized coordinates * relative to the page's default orientation. However, behind the scenes, the * coordinate system is different and %Poppler transparently transforms each * shape. If you never call either Annotation::setFlags or diff --git a/qt5/tests/check_metadata.cpp b/qt5/tests/check_metadata.cpp index 05abbaf4..21262a11 100644 --- a/qt5/tests/check_metadata.cpp +++ b/qt5/tests/check_metadata.cpp @@ -33,7 +33,7 @@ void TestMetaData::checkStrings_data() QTest::newRow( "Title" ) << "Title" << "Two pages"; QTest::newRow( "Subject" ) << "Subject" << "A two page layout for poppler testing"; - QTest::newRow( "Keywords" ) << "Keywords" << "Qt4 bindings"; + QTest::newRow( "Keywords" ) << "Keywords" << "Qt5 bindings"; QTest::newRow( "Creator" ) << "Creator" << "iText: cgpdftops CUPS filter"; QTest::newRow( "Producer" ) << "Producer" << "Acrobat Distiller 7.0 for Macintosh"; } commit a9581e624fa62b3905b790ac10d1349b1f96048a Author: Roland Hieber <[email protected]> Date: Fri Aug 11 11:44:26 2017 +0200 Form.h: fix error: 'vector' in namespace 'std' does not name a type Bug #102147 Original error message while compiling with OSELAS.Toolchain-2016.06.1-arm-v7a-linux-gnueabi, gcc-5.4.0-glibc-2.23-binutils-2.26-kernel-4.6-sanitized: make[5]: Entering directory '/ptx/work/dude/WORK_B/rhi/OSELAS.BSP-Miele-PST/platform-cpu20/build-target/poppler-0.57.0/qt4/src' CXX libpoppler_qt4_la-poppler-form.lo In file included from poppler-form.cc:26:0: ../../poppler/Form.h:544:14: error: 'vector' in namespace 'std' does not name a template type ../../poppler/Form.h:556:8: error: 'vector' in namespace 'std' does not name a template type Makefile:735: recipe for target 'libpoppler_qt4_la-poppler-form.lo' failed configure arguments were: --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=/usr/lib --host=arm-v7a-linux-gnueabi --build=x86_64-host-linux-gnu --enable-option-checking --disable-silent-rules --disable-dependency-tracking --enable-shared --enable-fast-install --enable-libtool-lock --enable-xpdf-headers --enable-build-type=release --disable-single-precision --enable-fixedpoint --enable-cmyk --disable-relocatable --enable-libopenjpeg=none --disable-libnss --disable-libtiff --enable-largefile --enable-zlib --disable-zlib-uncompress --enable-libcurl --enable-dctdecoder=libjpeg --enable-libpng --disable-splash-output --enable-cairo-output --enable-poppler-glib --disable-introspection --disable-gtk-doc --disable-gtk-doc-html --disable-gtk-doc-pdf --enable-poppler-qt4 --disable-poppler-qt5 --enable-poppler-cpp --disable-gtk-test --enable-utils --disable-compile-warnings --enable-cms=lcms1 --without-x --with-font-configuration=fontconfig --without-libiconv-prefix --with-testdatadir= Signed-off-by: Roland Hieber <[email protected]> diff --git a/poppler/Form.h b/poppler/Form.h index d73ab898..c0550084 100644 --- a/poppler/Form.h +++ b/poppler/Form.h @@ -13,6 +13,7 @@ // Copyright 2013 Adrian Johnson <[email protected]> // Copyright 2015 André Guerreiro <[email protected]> // Copyright 2015 André Esser <[email protected]> +// Copyright 2017 Roland Hieber <[email protected]> // //======================================================================== @@ -27,6 +28,7 @@ #include "Annot.h" #include <set> +#include <vector> class GooString; class Array;
_______________________________________________ poppler mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/poppler
