[poppler] Branch 'poppler-0.8' - poppler/Gfx.cc

[Albert Astals Cid]

 poppler/Gfx.cc |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 395000cf0d55e2d861a7a038206662c39db0be80
Author: Albert Astals Cid <aacid at kde.org>
Date:   Sat Apr 12 00:44:08 2008 +0200

    Do not take into account Colorspace resource subdictionary for image XObjects
    
    Fixes bug 15125
    The motivation under that change is on section 4.5.2 of the spec:
     Certain objects, such as image XObjects, specify a
     color space as an explicit parameter, often associated with the key ColorSpace.
     In this case, the color space array or name is always defined directly as a PDF
     object, not by an entry in the ColorSpace resource subdictionary. This conven-
     tion also applies when color spaces are defined in terms of other color spaces.

diff --git a/poppler/Gfx.cc b/poppler/Gfx.cc
index 0618ab0..6fc9b8d 100644
--- a/poppler/Gfx.cc
+++ b/poppler/Gfx.cc
@@ -3627,7 +3627,7 @@ void Gfx::doImage(Object *ref, Stream *str, GBool inlineImg) {
       obj1.free();
       dict->lookup("CS", &obj1);
     }
-    if (obj1.isName()) {
+    if (obj1.isName() && inlineImg) {
       res->lookupColorSpace(obj1.getName(), &obj2);
       if (!obj2.isNull()) {
 	obj1.free();