poppler/Catalog.cc | 3 +--
qt4/src/poppler-embeddedfile.cc | 1 +
qt4/src/poppler-private.h | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
New commits:
diff-tree 97f4fbbab7f2dac8792fb2cfc6f1510421fede4d (from
53ce2750c094e54aabac5aebabe71e1e4c3982b2)
Author: Albert Astals Cid <[EMAIL PROTECTED]>
Date: Fri Oct 12 13:44:10 2007 +0200
Copy the embeddef file description string correctly
diff --git a/poppler/Catalog.cc b/poppler/Catalog.cc
index 8702270..48337e2 100644
--- a/poppler/Catalog.cc
+++ b/poppler/Catalog.cc
@@ -383,8 +383,7 @@ EmbFile *Catalog::embeddedFile(int i)
Object obj, obj2;
obj = embeddedFileNameTree.getValue(i);
GooString *fileName = new GooString();
- char *descString = embeddedFileNameTree.getName(i)->getCString();
- GooString *desc = new GooString(descString);
+ GooString *desc = new GooString(embeddedFileNameTree.getName(i));
GooString *createDate = new GooString();
GooString *modDate = new GooString();
GooString *checksum = new GooString();
diff-tree 53ce2750c094e54aabac5aebabe71e1e4c3982b2 (from
136f9ceca66afadb06f3e92f89180fde48a36b05)
Author: Albert Astals Cid <[EMAIL PROTECTED]>
Date: Fri Oct 12 13:43:21 2007 +0200
Correctly delete the embedded file stream
diff --git a/qt4/src/poppler-embeddedfile.cc b/qt4/src/poppler-embeddedfile.cc
index 5b63d31..5d60dd1 100644
--- a/qt4/src/poppler-embeddedfile.cc
+++ b/qt4/src/poppler-embeddedfile.cc
@@ -56,6 +56,7 @@ EmbeddedFile::EmbeddedFile(EmbFile *embf
EmbeddedFile::~EmbeddedFile()
{
+ m_embeddedFile->m_streamObject.free();
delete m_embeddedFile;
}
diff --git a/qt4/src/poppler-private.h b/qt4/src/poppler-private.h
index 35ed164..c1a266d 100644
--- a/qt4/src/poppler-private.h
+++ b/qt4/src/poppler-private.h
@@ -159,8 +159,8 @@ namespace Poppler {
~DocumentData()
{
- delete doc;
qDeleteAll(m_embeddedFiles);
+ delete doc;
delete m_outputDev;
delete m_fontInfoScanner;
_______________________________________________
poppler mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/poppler
