[poppler] 2 commits - poppler/GfxState.cc

[Albert Astals Cid]

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

New commits:
commit 7b9a9f809d07303fe5adff9210731613df8b2adf
Merge: 3b0962c... 9451b7a...
Author: Albert Astals Cid <aacid at kde.org>
Date:   Wed Oct 3 01:24:04 2012 +0200

    Merge remote-tracking branch 'origin/poppler-0.20'

commit 9451b7a61b6dcaa6c4a76f3efda82f1ebd408654
Author: Albert Astals Cid <aacid at kde.org>
Date:   Wed Oct 3 01:21:45 2012 +0200

    Fix crash when parsing some unknown colorspaces
    
    Can't do csObj->getName if csObj is a dict

diff --git a/poppler/GfxState.cc b/poppler/GfxState.cc
index b21c2b0..b8cb007 100644
--- a/poppler/GfxState.cc
+++ b/poppler/GfxState.cc
@@ -312,7 +312,7 @@ GfxColorSpace *GfxColorSpace::parse(Object *csObj, Gfx *gfx, int recursion) {
     } else if (obj1.isName("DeviceCMYK")) {
       cs = new GfxDeviceCMYKColorSpace();
     } else {
-      error(errSyntaxWarning, -1, "Bad color space '{0:s}'", csObj->getName());
+      error(errSyntaxWarning, -1, "Bad color space dict'");
     }
     obj1.free();
   } else {