qt4/src/poppler-private.cc | 5 +++-- qt5/src/poppler-private.cc | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-)
New commits: commit bc8076d8f638ccb44f8e3b94aaae96850b025deb Author: Albert Astals Cid <[email protected]> Date: Sun Mar 15 13:32:41 2015 +0100 Fix PDF Text String -> QString conversion If they are not UTF16-BE they are in PDFDocEncoding (not ascii) Fixes KDE bug #344849 diff --git a/qt4/src/poppler-private.cc b/qt4/src/poppler-private.cc index 308a966..bef72f0 100644 --- a/qt4/src/poppler-private.cc +++ b/qt4/src/poppler-private.cc @@ -1,6 +1,6 @@ /* poppler-private.cc: qt interface to poppler * Copyright (C) 2005, Net Integration Technologies, Inc. - * Copyright (C) 2006, 2011 by Albert Astals Cid <[email protected]> + * Copyright (C) 2006, 2011, 2015 by Albert Astals Cid <[email protected]> * Copyright (C) 2008, 2010, 2011 by Pino Toscano <[email protected]> * Copyright (C) 2013 by Thomas Freitag <[email protected]> * Copyright (C) 2013 Adrian Johnson <[email protected]> @@ -31,6 +31,7 @@ #include <Link.h> #include <Outline.h> +#include <PDFDocEncoding.h> #include <UnicodeMap.h> namespace Poppler { @@ -125,7 +126,7 @@ namespace Debug { } else { - u = s1->getChar(i) & 0xff; + u = pdfDocEncoding[s1->getChar(i) & 0xff]; ++i; } result += QChar( u ); diff --git a/qt5/src/poppler-private.cc b/qt5/src/poppler-private.cc index 91dc2aa..8ede957 100644 --- a/qt5/src/poppler-private.cc +++ b/qt5/src/poppler-private.cc @@ -1,6 +1,6 @@ /* poppler-private.cc: qt interface to poppler * Copyright (C) 2005, Net Integration Technologies, Inc. - * Copyright (C) 2006, 2011 by Albert Astals Cid <[email protected]> + * Copyright (C) 2006, 2011, 2015 by Albert Astals Cid <[email protected]> * Copyright (C) 2008, 2010, 2011, 2014 by Pino Toscano <[email protected]> * Copyright (C) 2013 by Thomas Freitag <[email protected]> * Copyright (C) 2013 Adrian Johnson <[email protected]> @@ -31,6 +31,7 @@ #include <Link.h> #include <Outline.h> +#include <PDFDocEncoding.h> #include <UnicodeMap.h> namespace Poppler { @@ -125,7 +126,7 @@ namespace Debug { } else { - u = s1->getChar(i) & 0xff; + u = pdfDocEncoding[s1->getChar(i) & 0xff]; ++i; } result += QChar( u ); _______________________________________________ poppler mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/poppler
