qt4/src/poppler-embeddedfile-private.h | 2 +- qt4/src/poppler-embeddedfile.cc | 2 +- qt4/src/poppler-page.cc | 2 +- qt4/src/poppler-qt4.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)
New commits: commit 74853614d617486b7b62e9c08be39a6e58bc7d9b Author: Pino Toscano <[email protected]> Date: Wed May 25 16:40:49 2011 +0200 update copyrights diff --git a/qt4/src/poppler-embeddedfile-private.h b/qt4/src/poppler-embeddedfile-private.h index d64b0d1..cdd9802 100644 --- a/qt4/src/poppler-embeddedfile-private.h +++ b/qt4/src/poppler-embeddedfile-private.h @@ -1,7 +1,7 @@ /* poppler-embeddedfile-private.h: Qt4 interface to poppler * Copyright (C) 2005, 2008, 2009, Albert Astals Cid <[email protected]> * Copyright (C) 2005, Brad Hards <[email protected]> - * Copyright (C) 2008, Pino Toscano <[email protected]> + * Copyright (C) 2008, 2011, Pino Toscano <[email protected]> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/qt4/src/poppler-embeddedfile.cc b/qt4/src/poppler-embeddedfile.cc index 6166bbd..fc1cfec 100644 --- a/qt4/src/poppler-embeddedfile.cc +++ b/qt4/src/poppler-embeddedfile.cc @@ -1,7 +1,7 @@ /* poppler-document.cc: qt interface to poppler * Copyright (C) 2005, 2008, 2009, Albert Astals Cid <[email protected]> * Copyright (C) 2005, Brad Hards <[email protected]> - * Copyright (C) 2008, Pino Toscano <[email protected]> + * Copyright (C) 2008, 2011, Pino Toscano <[email protected]> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/qt4/src/poppler-qt4.h b/qt4/src/poppler-qt4.h index 8119a25..4aab697 100644 --- a/qt4/src/poppler-qt4.h +++ b/qt4/src/poppler-qt4.h @@ -3,7 +3,7 @@ * Copyright (C) 2005, 2007, Brad Hards <[email protected]> * Copyright (C) 2005-2010, Albert Astals Cid <[email protected]> * Copyright (C) 2005, Stefan Kebekus <[email protected]> - * Copyright (C) 2006-2010, Pino Toscano <[email protected]> + * Copyright (C) 2006-2011, Pino Toscano <[email protected]> * Copyright (C) 2009 Shawn Rutledge <[email protected]> * Copyright (C) 2010 Suzuki Toshiya <[email protected]> * Copyright (C) 2010 Matthias Fauconneau <[email protected]> commit e6b2dec502c02f9fbaed480f227cf7145249a98e Author: Pino Toscano <[email protected]> Date: Wed May 25 16:39:09 2011 +0200 [qt4] one more usage of the new EmbeddedFile ctor followup of a264e5385b2d0fee5126b3d0e57d42d34cafa45d diff --git a/qt4/src/poppler-page.cc b/qt4/src/poppler-page.cc index 79f01bf..b92002c 100644 --- a/qt4/src/poppler-page.cc +++ b/qt4/src/poppler-page.cc @@ -940,7 +940,7 @@ QList<Annotation*> Page::annotations() const f->setFileIconName( QString::fromLatin1( attachann->getName()->getCString() ) ); // -> embeddedFile EmbFile *embfile = new EmbFile( attachann->getFile(), attachann->getContents() ); - f->setEmbeddedFile( new EmbeddedFile( embfile ) ); + f->setEmbeddedFile( new EmbeddedFile( *new EmbeddedFileData( embfile ) ) ); break; } case Annot::typeSound: _______________________________________________ poppler mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/poppler
