qt4/src/ArthurOutputDev.cc | 4 ++-- qt4/src/poppler-annotation.cc | 2 +- qt5/src/ArthurOutputDev.cc | 4 ++-- qt5/src/poppler-annotation.cc | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-)
New commits: commit 8073852c84b71257d487aa8a46e441aa82f4b42c Author: Fabio D'Urso <[email protected]> Date: Mon Apr 14 23:35:50 2014 +0200 qt: Fix missing ! in TextAnnotation::setInplaceIntent CID #16814 diff --git a/qt4/src/poppler-annotation.cc b/qt4/src/poppler-annotation.cc index 297cd86..70a5ea2 100644 --- a/qt4/src/poppler-annotation.cc +++ b/qt4/src/poppler-annotation.cc @@ -2062,7 +2062,7 @@ void TextAnnotation::setInplaceIntent( TextAnnotation::InplaceIntent intent ) { Q_D( TextAnnotation ); - if (d->pdfAnnot) + if (!d->pdfAnnot) { d->inplaceIntent = intent; return; diff --git a/qt5/src/poppler-annotation.cc b/qt5/src/poppler-annotation.cc index 62ccaa5..e6d331d 100644 --- a/qt5/src/poppler-annotation.cc +++ b/qt5/src/poppler-annotation.cc @@ -2049,7 +2049,7 @@ void TextAnnotation::setInplaceIntent( TextAnnotation::InplaceIntent intent ) { Q_D( TextAnnotation ); - if (d->pdfAnnot) + if (!d->pdfAnnot) { d->inplaceIntent = intent; return; commit 1fbf98664c0879ac035a63602242a910c0c1d316 Author: Albert Astals Cid <[email protected]> Date: Mon Apr 14 11:53:59 2014 +0200 Initialize tmpBufLen CID #16957 It isn't really needed since locateFont always returns a fontLoc with a non null path if fontLoc itself is not null, but it doesn't hurt either diff --git a/qt4/src/ArthurOutputDev.cc b/qt4/src/ArthurOutputDev.cc index 914edb9..05c95ba 100644 --- a/qt4/src/ArthurOutputDev.cc +++ b/qt4/src/ArthurOutputDev.cc @@ -14,7 +14,7 @@ // under GPL version 2 or later // // Copyright (C) 2005 Brad Hards <[email protected]> -// Copyright (C) 2005-2009, 2011, 2012 Albert Astals Cid <[email protected]> +// Copyright (C) 2005-2009, 2011, 2012, 2014 Albert Astals Cid <[email protected]> // Copyright (C) 2008, 2010 Pino Toscano <[email protected]> // Copyright (C) 2009, 2011 Carlos Garcia Campos <[email protected]> // Copyright (C) 2009 Petr Gajdos <[email protected]> @@ -279,7 +279,7 @@ void ArthurOutputDev::updateFont(GfxState *state) Object refObj, strObj; GooString *fileName; char *tmpBuf; - int tmpBufLen; + int tmpBufLen = 0; int *codeToGID; double *textMat; double m11, m12, m21, m22, fontSize; diff --git a/qt5/src/ArthurOutputDev.cc b/qt5/src/ArthurOutputDev.cc index 914edb9..05c95ba 100644 --- a/qt5/src/ArthurOutputDev.cc +++ b/qt5/src/ArthurOutputDev.cc @@ -14,7 +14,7 @@ // under GPL version 2 or later // // Copyright (C) 2005 Brad Hards <[email protected]> -// Copyright (C) 2005-2009, 2011, 2012 Albert Astals Cid <[email protected]> +// Copyright (C) 2005-2009, 2011, 2012, 2014 Albert Astals Cid <[email protected]> // Copyright (C) 2008, 2010 Pino Toscano <[email protected]> // Copyright (C) 2009, 2011 Carlos Garcia Campos <[email protected]> // Copyright (C) 2009 Petr Gajdos <[email protected]> @@ -279,7 +279,7 @@ void ArthurOutputDev::updateFont(GfxState *state) Object refObj, strObj; GooString *fileName; char *tmpBuf; - int tmpBufLen; + int tmpBufLen = 0; int *codeToGID; double *textMat; double m11, m12, m21, m22, fontSize; _______________________________________________ poppler mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/poppler
