[poppler] 2 commits - poppler/PSOutputDev.cc

[Albert Astals Cid]

 poppler/PSOutputDev.cc |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 6013d49d852c58c4c23f787fd7dd64731c0918f1
Merge: b97c28c... 671df5d...
Author: Albert Astals Cid <aacid at kde.org>
Date:   Wed Sep 26 00:53:28 2012 +0200

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

commit 671df5dad0732882ceb9e053c3f947dfe0597f3d
Author: Lu Wang <coolwanglu at gmail.com>
Date:   Wed Sep 26 00:52:32 2012 +0200

    Don't close the stream if it's not a stream

diff --git a/poppler/PSOutputDev.cc b/poppler/PSOutputDev.cc
index f414897..e4c925c 100644
--- a/poppler/PSOutputDev.cc
+++ b/poppler/PSOutputDev.cc
@@ -27,6 +27,7 @@
 // Copyright (C) 2009 Kovid Goyal <kovid at kovidgoyal.net>
 // Copyright (C) 2009-2011 Adrian Johnson <ajohnson at redneon.com>
 // Copyright (C) 2012 Fabio D'Urso <fabiodurso at hotmail.it>
+// Copyright (C) 2012 Lu Wang <coolwanglu at 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
@@ -2151,7 +2152,8 @@ void PSOutputDev::setupEmbeddedType1Font(Ref *id, GooString *psName) {
   writePS("%%EndResource\n");
 
  err1:
-  strObj.streamClose();
+  if (strObj.isStream())
+    strObj.streamClose();
   strObj.free();
 }