Painful merge.

Painful merge.

I merged the latest release into the CVS.

This version supports the regular xpdf or gpdf if the GNOME libraries
are found.

Miguel.

1 files changed, 6 insertions, 3 deletions

diff --git a/pdf/xpdf/Object.cc b/pdf/xpdf/Object.cc
index 777f526..f9c1067 100644
--- a/pdf/xpdf/Object.cc
+++ b/pdf/xpdf/Object.cc
@@ -106,16 +106,19 @@ void Object::free() {
     gfree(name);
     break;
   case objArray:
-    if (!array->decRef())
+    if (!array->decRef()) {
       delete array;
+    }
     break;
   case objDict:
-    if (!dict->decRef())
+    if (!dict->decRef()) {
       delete dict;
+    }
     break;
   case objStream:
-    if (!stream->decRef())
+    if (!stream->decRef()) {
       delete stream;
+    }
     break;
   case objCmd:
     gfree(cmd);