Attachment 103401 Details for Bug 65956 – patch no. 1

[patch] patch no. 1

debug.patch (text/plain), 1022 bytes, created by Jiri Slaby on 2014-07-24 15:05:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jiri Slaby

Created: 2014-07-24 15:05:12 UTC

Size: 1022 bytes

patch

obsolete

>---
> poppler/Annot.cc             |    2 +-
> poppler/CharCodeToUnicode.cc |    2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
>--- a/poppler/Annot.cc
>+++ b/poppler/Annot.cc
>@@ -4087,7 +4087,7 @@ void Annot::layoutText(GooString *text,
>         // 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
>--- a/poppler/CharCodeToUnicode.cc
>+++ b/poppler/CharCodeToUnicode.cc
>@@ -633,7 +633,7 @@ int CharCodeToUnicode::mapToUnicode(Char
> 
> 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;

Actions: View | Splinter Review

Attachments on bug 65956: 103286 | 103401 | 103402 | 103432 | 123031 | 137093

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.