[poppler] Branch 'poppler-0.26' - poppler/Annot.cc poppler/CharCodeToUnicode.cc poppler/SplashOutputDev.cc

[Albert Astals Cid]

 poppler/Annot.cc             |    2 +-
 poppler/CharCodeToUnicode.cc |    2 +-
 poppler/SplashOutputDev.cc   |    9 ++++-----
 3 files changed, 6 insertions(+), 7 deletions(-)

New commits:
commit 1b9c54286a4cdfaa284795933c20acf3c7e13bfc
Author: Ed Porras <ed at moto-research.com>
Date:   Sun Aug 3 01:01:35 2014 +0200

    Don't check for inlineImg twice
    
    Bug #82059

diff --git a/poppler/Annot.cc b/poppler/Annot.cc
index a559836..591fe79 100644
--- a/poppler/Annot.cc
+++ b/poppler/Annot.cc
@@ -4087,7 +4087,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 16ba6d4..b1c1bab 100644
--- a/poppler/CharCodeToUnicode.cc
+++ b/poppler/CharCodeToUnicode.cc
@@ -633,7 +633,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 01979fd..fd0f841 100644
--- a/poppler/SplashOutputDev.cc
+++ b/poppler/SplashOutputDev.cc
@@ -32,6 +32,7 @@
 // Copyright (C) 2011, 2012 Adrian Johnson <ajohnson at redneon.com>
 // Copyright (C) 2013 Lu Wang <coolwanglu at gmail.com>
 // Copyright (C) 2013 Li Junling <lijunling at sina.com>
+// Copyright (C) 2014 Ed Porras <ed at 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
@@ -2694,11 +2695,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;
     }
   }