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 825c942d46e0c3e254028441015c5dd8440cc734 (from
5e60da78695eff44cc10dbce46ef170727f682b1)
Author: Albert Astals Cid <[EMAIL PROTECTED]>
Date: Fri Oct 12 13:47:09 2007 +0200
Copy the embeddef file description string correctly
diff --git a/poppler/Catalog.cc b/poppler/Catalog.cc
index be31bd4..2e12aed 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 5e60da78695eff44cc10dbce46ef170727f682b1 (from
1627fbbde8be01af3bdd2583f3439897a37d5215)
Author: Albert Astals Cid <[EMAIL PROTECTED]>
Date: Fri Oct 12 13:46:52 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 43a67c8..8ab8b59 100644
--- a/qt4/src/poppler-private.h
+++ b/qt4/src/poppler-private.h
@@ -134,8 +134,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
