diff options
author | Pino Toscano <pino@kde.org> | 2008-08-23 01:45:07 +0200 |
---|---|---|
committer | Pino Toscano <pino@kde.org> | 2008-08-23 01:45:07 +0200 |
commit | 820f15009845870701e1f4e7f4fc4fb93312ab3e (patch) | |
tree | e6b1095886ada8c02e6e1824ee3f2381e50cf294 /poppler/Movie.cc | |
parent | c3a006ae35250e9a5638c2ce713b7470380751c7 (diff) |
fix Movie::copy()
the default copy ctor already does the vertbatim copies, so no need to
do them on our own; what needs to be done is checking whether an object
is valid before either doing a "smart copy" or "postprocessing" it
Diffstat (limited to 'poppler/Movie.cc')
-rw-r--r-- | poppler/Movie.cc | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/poppler/Movie.cc b/poppler/Movie.cc index 66b87dd3..f0a47960 100644 --- a/poppler/Movie.cc +++ b/poppler/Movie.cc @@ -431,14 +431,16 @@ Movie* Movie::copy() { // call default copy constructor Movie* new_movie = new Movie(*this); - new_movie->contentType = contentType->copy(); - new_movie->fileName = fileName->copy(); + if (contentType) + new_movie->contentType = contentType->copy(); + if (fileName) + new_movie->fileName = fileName->copy(); - new_movie->embeddedStream = embeddedStream; - new_movie->embeddedStream->incRef(); + if (new_movie->embeddedStream) + new_movie->embeddedStream->incRef(); - new_movie->posterStream = posterStream; - new_movie->posterStream->incRef(); + if (new_movie->posterStream) + new_movie->posterStream->incRef(); return new_movie; } |