diff options
| author | Albert Astals Cid <aacid@kde.org> | 2014-08-03 01:06:57 +0200 |
|---|---|---|
| committer | Albert Astals Cid <aacid@kde.org> | 2014-08-03 01:06:57 +0200 |
| commit | b72a534d6c7d8bc026812b68f9d9ac6bf9a2200a (patch) | |
| tree | f54a574fa377d726a8a67639107e6ec7af4e0d75 | |
| parent | f2e4154eff52b86e62490a3ccba470824c9cf436 (diff) | |
| parent | ef3f7585fac086de0919aa0bb0ef91a5070ac23e (diff) | |
Merge remote-tracking branch 'origin/poppler-0.26'
| -rw-r--r-- | poppler/Annot.cc | 3 | ||||
| -rw-r--r-- | poppler/CharCodeToUnicode.cc | 3 | ||||
| -rw-r--r-- | poppler/SplashOutputDev.cc | 9 |
3 files changed, 8 insertions, 7 deletions
diff --git a/poppler/Annot.cc b/poppler/Annot.cc index a5598365..fa98b69b 100644 --- a/poppler/Annot.cc +++ b/poppler/Annot.cc @@ -30,6 +30,7 @@ // Copyright (C) 2013 Peter Breitenlohner <peb@mppmu.mpg.de> // Copyright (C) 2013 Adrian Johnson <ajohnson@redneon.com> // Copyright (C) 2014 Marek Kasik <mkasik@redhat.com> +// Copyright (C) 2014 Jiri Slaby <jirislaby@gmail.com> // // 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 @@ -4087,7 +4088,7 @@ void Annot::layoutText(GooString *text, GooString *outBuf, int *i, // This assumes an identity CMap. outBuf->append((uChar >> 8) & 0xff); outBuf->append(uChar & 0xff); - } else if (ccToUnicode->mapToCharCode(&uChar, &c, 1)) { + } else if (ccToUnicode->mapToCharCode(&uChar, &c, 2)) { ccToUnicode->decRefCnt(); if (font->isCIDFont()) { // TODO: This assumes an identity CMap. It should be extended to diff --git a/poppler/CharCodeToUnicode.cc b/poppler/CharCodeToUnicode.cc index 16ba6d48..59b7c93e 100644 --- a/poppler/CharCodeToUnicode.cc +++ b/poppler/CharCodeToUnicode.cc @@ -22,6 +22,7 @@ // Copyright (C) 2010 Jakub Wilk <ubanus@users.sf.net> // Copyright (C) 2012 Thomas Freitag <Thomas.Freitag@alfa.de> // Copyright (C) 2012 Adrian Johnson <ajohnson@redneon.com> +// Copyright (C) 2014 Jiri Slaby <jirislaby@gmail.com> // // 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 @@ -633,7 +634,7 @@ int CharCodeToUnicode::mapToUnicode(CharCode c, Unicode **u) { int CharCodeToUnicode::mapToCharCode(Unicode* u, CharCode *c, int usize) { //look for charcode in map - if (usize == 1) { + if (usize == 1 || (usize > 1 && !(*u & ~0xff))) { if (isIdentity) { *c = (CharCode) *u; return 1; diff --git a/poppler/SplashOutputDev.cc b/poppler/SplashOutputDev.cc index cda0146b..0eaeb79f 100644 --- a/poppler/SplashOutputDev.cc +++ b/poppler/SplashOutputDev.cc @@ -32,6 +32,7 @@ // Copyright (C) 2011, 2012 Adrian Johnson <ajohnson@redneon.com> // Copyright (C) 2013 Lu Wang <coolwanglu@gmail.com> // Copyright (C) 2013 Li Junling <lijunling@sina.com> +// Copyright (C) 2014 Ed Porras <ed@moto-research.com> // // 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 @@ -2696,11 +2697,9 @@ void SplashOutputDev::drawImageMask(GfxState *state, Object *ref, Stream *str, splash->fillImageMask(&imageMaskSrc, &imgMaskData, width, height, mat, t3GlyphStack != NULL); if (inlineImg) { - if (inlineImg) { - while (imgMaskData.y < height) { - imgMaskData.imgStr->getLine(); - ++imgMaskData.y; - } + while (imgMaskData.y < height) { + imgMaskData.imgStr->getLine(); + ++imgMaskData.y; } } |