poppler/GfxState.cc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
New commits: commit 8e24fcc0d296e07327e9cbe297f627bfc6471ee3 Merge: 85efba3 b02f873 Author: Albert Astals Cid <[email protected]> Date: Wed Dec 18 21:51:57 2013 +0100 Merge remote-tracking branch 'origin/poppler-0.24' Conflicts: poppler/GfxState.cc diff --cc poppler/GfxState.cc index 7c7928a,2b0a29b..c6f855b --- a/poppler/GfxState.cc +++ b/poppler/GfxState.cc @@@ -25,7 -25,7 +25,8 @@@ // Copyright (C) 2011 Andrea Canciani <[email protected]> // Copyright (C) 2012 William Bader <[email protected]> // Copyright (C) 2013 Lu Wang <[email protected]> +// Copyright (C) 2013 Hib Eris <[email protected]> + // Copyright (C) 2013 Fabio D'Urso <[email protected]> // // 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 commit b02f873174865837fed3a9544b70b8b21747a3dd Author: Fabio D'Urso <[email protected]> Date: Wed Dec 18 21:46:12 2013 +0100 Fixed some GooString format markers diff --git a/poppler/GfxState.cc b/poppler/GfxState.cc index 0bafb6d..2b0a29b 100644 --- a/poppler/GfxState.cc +++ b/poppler/GfxState.cc @@ -25,6 +25,7 @@ // Copyright (C) 2011 Andrea Canciani <[email protected]> // Copyright (C) 2012 William Bader <[email protected]> // Copyright (C) 2013 Lu Wang <[email protected]> +// Copyright (C) 2013 Fabio D'Urso <[email protected]> // // 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 @@ -2361,7 +2362,7 @@ void GfxSeparationColorSpace::createMapping(GooList *separationList, int maxSepC if (!sepCS->getName()->cmp(name)) { if (sepCS->getFunc()->hasDifferentResultSet(func)) { error(errSyntaxWarning, -1, - "Different functions found for '{0:s}', convert immediately", name); + "Different functions found for '{0:t}', convert immediately", name); gfree(mapping); mapping = NULL; return; @@ -2374,7 +2375,7 @@ void GfxSeparationColorSpace::createMapping(GooList *separationList, int maxSepC } if (separationList->getLength() == maxSepComps) { error(errSyntaxWarning, -1, - "Too many ({0:d}) spots, convert '{1:s}' immediately", maxSepComps, name); + "Too many ({0:d}) spots, convert '{1:t}' immediately", maxSepComps, name); gfree(mapping); mapping = NULL; return; @@ -2675,7 +2676,7 @@ void GfxDeviceNColorSpace::createMapping(GooList *separationList, int maxSepComp if (!sepCS->getName()->cmp(names[i])) { if (sepFunc != NULL && sepCS->getFunc()->hasDifferentResultSet(sepFunc)) { error(errSyntaxWarning, -1, - "Different functions found for '{0:s}', convert immediately", names[i]); + "Different functions found for '{0:t}', convert immediately", names[i]); gfree(mapping); mapping = NULL; overprintMask = 0xffffffff; @@ -2691,7 +2692,7 @@ void GfxDeviceNColorSpace::createMapping(GooList *separationList, int maxSepComp if (!found) { if (separationList->getLength() == maxSepComps) { error(errSyntaxWarning, -1, - "Too many ({0:d}) spots, convert '{1:s}' immediately", maxSepComps, names[i]); + "Too many ({0:d}) spots, convert '{1:t}' immediately", maxSepComps, names[i]); gfree(mapping); mapping = NULL; overprintMask = 0xffffffff; _______________________________________________ poppler mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/poppler
