summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--poppler/Hints.cc3
-rw-r--r--poppler/JBIG2Stream.cc4
-rw-r--r--poppler/PSOutputDev.cc4
-rw-r--r--poppler/SecurityHandler.cc3
-rw-r--r--poppler/StructTreeRoot.cc3
-rw-r--r--qt4/src/poppler-annotation.cc6
-rw-r--r--qt5/src/poppler-annotation.cc6
-rw-r--r--utils/HtmlOutputDev.cc11
8 files changed, 22 insertions, 18 deletions
diff --git a/poppler/Hints.cc b/poppler/Hints.cc
index 3c2d070c..20bc9526 100644
--- a/poppler/Hints.cc
+++ b/poppler/Hints.cc
@@ -8,6 +8,7 @@
// Copyright 2010, 2011, 2013 Albert Astals Cid <aacid@kde.org>
// Copyright 2010, 2013 Pino Toscano <pino@kde.org>
// Copyright 2013 Adrian Johnson <ajohnson@redneon.com>
+// Copyright 2014 Fabio D'Urso <fabiodurso@hotmail.it>
//
//========================================================================
@@ -38,7 +39,7 @@ Hints::Hints(BaseStream *str, Linearization *linearization, XRef *xref, Security
pageObjectFirst = linearization->getObjectNumberFirst();
if (pageObjectFirst < 0 || pageObjectFirst >= xref->getNumObjects()) {
error(errSyntaxWarning, -1,
- "Invalid reference for first page object (%d) in linearization table ",
+ "Invalid reference for first page object ({0:d}) in linearization table ",
pageObjectFirst);
pageObjectFirst = 0;
}
diff --git a/poppler/JBIG2Stream.cc b/poppler/JBIG2Stream.cc
index bda7d523..33241436 100644
--- a/poppler/JBIG2Stream.cc
+++ b/poppler/JBIG2Stream.cc
@@ -21,7 +21,7 @@
// Copyright (C) 2012 William Bader <williambader@hotmail.com>
// Copyright (C) 2012 Thomas Freitag <Thomas.Freitag@alfa.de>
// Copyright (C) 2013 Adrian Johnson <ajohnson@redneon.com>
-// Copyright (C) 2013 Fabio D'Urso <fabiodurso@hotmail.it>
+// Copyright (C) 2013, 2014 Fabio D'Urso <fabiodurso@hotmail.it>
//
// 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
@@ -1840,7 +1840,7 @@ GBool JBIG2Stream::readSymbolDictSeg(Guint segNum, Guint length,
}
refBitmap = bitmaps[symID];
if (unlikely(refBitmap == NULL)) {
- error(errSyntaxError, curStr->getPos(), "Invalid ref bitmap for symbol ID {0:d} in JBIG2 symbol dictionary", symID);
+ error(errSyntaxError, curStr->getPos(), "Invalid ref bitmap for symbol ID {0:ud} in JBIG2 symbol dictionary", symID);
goto syntaxError;
}
bitmaps[numInputSyms + i] =
diff --git a/poppler/PSOutputDev.cc b/poppler/PSOutputDev.cc
index a85fc24c..cfe47af4 100644
--- a/poppler/PSOutputDev.cc
+++ b/poppler/PSOutputDev.cc
@@ -26,7 +26,7 @@
// Copyright (C) 2009, 2011, 2012 William Bader <williambader@hotmail.com>
// Copyright (C) 2009 Kovid Goyal <kovid@kovidgoyal.net>
// Copyright (C) 2009-2011, 2013 Adrian Johnson <ajohnson@redneon.com>
-// Copyright (C) 2012 Fabio D'Urso <fabiodurso@hotmail.it>
+// Copyright (C) 2012, 2014 Fabio D'Urso <fabiodurso@hotmail.it>
// Copyright (C) 2012 Lu Wang <coolwanglu@gmail.com>
//
// To see a description of the changes please see the Changelog file that
@@ -2508,7 +2508,7 @@ void PSOutputDev::setupExternalCIDTrueTypeFont(GfxFont *font,
gfree(codeToGID);
} else {
error(errSyntaxError, -1,
- "TrueType font '%s' does not allow embedding",
+ "TrueType font '{0:s}' does not allow embedding",
font->getName() ? font->getName()->getCString() : "(unnamed)");
}
diff --git a/poppler/SecurityHandler.cc b/poppler/SecurityHandler.cc
index 8b85e60d..d6f55995 100644
--- a/poppler/SecurityHandler.cc
+++ b/poppler/SecurityHandler.cc
@@ -15,6 +15,7 @@
//
// Copyright (C) 2010, 2012 Albert Astals Cid <aacid@kde.org>
// Copyright (C) 2013 Adrian Johnson <ajohnson@redneon.com>
+// Copyright (C) 2014 Fabio D'Urso <fabiodurso@hotmail.it>
//
// 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
@@ -295,7 +296,7 @@ StandardSecurityHandler::StandardSecurityHandler(PDFDoc *docA,
ok = gTrue;
} else if (!(encVersion == -1 && encRevision == -1)) {
error(errUnimplemented, -1,
- "Unsupported version/revision (%d/%d) of Standard security handler",
+ "Unsupported version/revision ({0:d}/{1:d}) of Standard security handler",
encVersion, encRevision);
}
} else {
diff --git a/poppler/StructTreeRoot.cc b/poppler/StructTreeRoot.cc
index 59f017ee..4fff2974 100644
--- a/poppler/StructTreeRoot.cc
+++ b/poppler/StructTreeRoot.cc
@@ -5,6 +5,7 @@
// This file is licensed under the GPLv2 or later
//
// Copyright 2013 Igalia S.L.
+// Copyright 2014 Fabio D'Urso <fabiodurso@hotmail.it>
//
//========================================================================
@@ -94,7 +95,7 @@ void StructTreeRoot::parse(Dict *root)
index.free();
}
} else {
- error(errSyntaxError, -1, "Nums array length is not a even ({0:i})", nums.arrayGetLength());
+ error(errSyntaxError, -1, "Nums array length is not a even ({0:d})", nums.arrayGetLength());
}
} else {
error(errSyntaxError, -1, "Nums object is wrong type ({0:s})", nums.getTypeName());
diff --git a/qt4/src/poppler-annotation.cc b/qt4/src/poppler-annotation.cc
index 6d190653..297cd86b 100644
--- a/qt4/src/poppler-annotation.cc
+++ b/qt4/src/poppler-annotation.cc
@@ -2,7 +2,7 @@
* Copyright (C) 2006, 2009, 2012, 2013 Albert Astals Cid <aacid@kde.org>
* Copyright (C) 2006, 2008, 2010 Pino Toscano <pino@kde.org>
* Copyright (C) 2012, Guillermo A. Amaral B. <gamaral@kde.org>
- * Copyright (C) 2012, 2013 Fabio D'Urso <fabiodurso@hotmail.it>
+ * Copyright (C) 2012-2014 Fabio D'Urso <fabiodurso@hotmail.it>
* Copyright (C) 2012, Tobias Koenig <tokoe@kdab.com>
* Adapting code from
* Copyright (C) 2004 by Enrico Ros <eros.kde@email.it>
@@ -383,7 +383,7 @@ QList<Annotation*> AnnotationPrivate::findAnnotations(::Page *pdfPage, DocumentD
Annot * ann = annots->getAnnot( j );
if ( !ann )
{
- error(errInternal, -1, "Annot %u is null", j);
+ error(errInternal, -1, "Annot {0:ud} is null", j);
continue;
}
@@ -536,7 +536,7 @@ QList<Annotation*> AnnotationPrivate::findAnnotations(::Page *pdfPage, DocumentD
CASE_FOR_TYPE( TrapNet )
CASE_FOR_TYPE( Watermark )
CASE_FOR_TYPE( 3D )
- default: error(errUnimplemented, -1, "Annotation %u not supported", subType);
+ default: error(errUnimplemented, -1, "Annotation {0:d} not supported", subType);
}
continue;
#undef CASE_FOR_TYPE
diff --git a/qt5/src/poppler-annotation.cc b/qt5/src/poppler-annotation.cc
index 9a8b6558..62ccaa56 100644
--- a/qt5/src/poppler-annotation.cc
+++ b/qt5/src/poppler-annotation.cc
@@ -2,7 +2,7 @@
* Copyright (C) 2006, 2009, 2012, 2013 Albert Astals Cid <aacid@kde.org>
* Copyright (C) 2006, 2008, 2010 Pino Toscano <pino@kde.org>
* Copyright (C) 2012, Guillermo A. Amaral B. <gamaral@kde.org>
- * Copyright (C) 2012, 2013 Fabio D'Urso <fabiodurso@hotmail.it>
+ * Copyright (C) 2012-2014 Fabio D'Urso <fabiodurso@hotmail.it>
* Copyright (C) 2012, Tobias Koenig <tokoe@kdab.com>
* Adapting code from
* Copyright (C) 2004 by Enrico Ros <eros.kde@email.it>
@@ -383,7 +383,7 @@ QList<Annotation*> AnnotationPrivate::findAnnotations(::Page *pdfPage, DocumentD
Annot * ann = annots->getAnnot( j );
if ( !ann )
{
- error(errInternal, -1, "Annot %u is null", j);
+ error(errInternal, -1, "Annot {0:ud} is null", j);
continue;
}
@@ -536,7 +536,7 @@ QList<Annotation*> AnnotationPrivate::findAnnotations(::Page *pdfPage, DocumentD
CASE_FOR_TYPE( TrapNet )
CASE_FOR_TYPE( Watermark )
CASE_FOR_TYPE( 3D )
- default: error(errUnimplemented, -1, "Annotation %u not supported", subType);
+ default: error(errUnimplemented, -1, "Annotation {0:d} not supported", subType);
}
continue;
#undef CASE_FOR_TYPE
diff --git a/utils/HtmlOutputDev.cc b/utils/HtmlOutputDev.cc
index a3ae239e..35e98b46 100644
--- a/utils/HtmlOutputDev.cc
+++ b/utils/HtmlOutputDev.cc
@@ -37,6 +37,7 @@
// Copyright (C) 2013 Thomas Freitag <Thomas.Freitag@alfa.de>
// Copyright (C) 2013 Julien Nabet <serval2412@yahoo.fr>
// Copyright (C) 2013 Johannes Brandst├Ątter <jbrandstaetter@gmail.com>
+// Copyright (C) 2014 Fabio D'Urso <fabiodurso@hotmail.it>
//
// 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
@@ -1327,7 +1328,7 @@ void HtmlOutputDev::drawJpegImage(GfxState *state, Stream *str)
// open the image file
GooString *fName=createImageFileName("jpg");
if (!(f1 = fopen(fName->getCString(), "wb"))) {
- error(errIO, -1, "Couldn't open image file '%s'", fName->getCString());
+ error(errIO, -1, "Couldn't open image file '{0:t}'", fName);
delete fName;
return;
}
@@ -1361,7 +1362,7 @@ void HtmlOutputDev::drawPngImage(GfxState *state, Stream *str, int width, int he
// open the image file
GooString *fName=createImageFileName("png");
if (!(f1 = fopen(fName->getCString(), "wb"))) {
- error(errIO, -1, "Couldn't open image file '%s'", fName->getCString());
+ error(errIO, -1, "Couldn't open image file '{0:t}'", fName);
delete fName;
return;
}
@@ -1369,7 +1370,7 @@ void HtmlOutputDev::drawPngImage(GfxState *state, Stream *str, int width, int he
PNGWriter *writer = new PNGWriter( isMask ? PNGWriter::MONOCHROME : PNGWriter::RGB );
// TODO can we calculate the resolution of the image?
if (!writer->init(f1, width, height, 72, 72)) {
- error(errInternal, -1, "Can't init PNG for image '%s'", fName->getCString());
+ error(errInternal, -1, "Can't init PNG for image '{0:t}'", fName);
delete writer;
fclose(f1);
return;
@@ -1401,7 +1402,7 @@ void HtmlOutputDev::drawPngImage(GfxState *state, Stream *str, int width, int he
}
if (!writer->writeRow(row_pointer)) {
- error(errIO, -1, "Failed to write into PNG '%s'", fName->getCString());
+ error(errIO, -1, "Failed to write into PNG '{0:t}'", fName);
delete writer;
delete imgStr;
fclose(f1);
@@ -1438,7 +1439,7 @@ void HtmlOutputDev::drawPngImage(GfxState *state, Stream *str, int width, int he
if (!writer->writeRow( &png_row ))
{
- error(errIO, -1, "Failed to write into PNG '%s'", fName->getCString());
+ error(errIO, -1, "Failed to write into PNG '{0:t}'", fName);
delete writer;
fclose(f1);
gfree(png_row);