projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "Avoid decoding other packets when looking for subs."
[dcpomatic.git]
/
src
/
lib
/
image_decoder.h
diff --git
a/src/lib/image_decoder.h
b/src/lib/image_decoder.h
index f4d81dfb507a5ef545c0f573542904472d023956..4d96306a89c63775121f4e243da36ce2aa507372 100644
(file)
--- a/
src/lib/image_decoder.h
+++ b/
src/lib/image_decoder.h
@@
-19,28
+19,23
@@
#include "video_decoder.h"
#include "video_decoder.h"
-namespace Magick {
- class Image;
-}
-
class ImageContent;
class ImageDecoder : public VideoDecoder
{
public:
class ImageContent;
class ImageDecoder : public VideoDecoder
{
public:
- ImageDecoder (boost::shared_ptr<const
Film>, boost::shared_ptr<const ImageContent>
);
+ ImageDecoder (boost::shared_ptr<const
ImageContent> c
);
boost::shared_ptr<const ImageContent> content () {
return _image_content;
}
boost::shared_ptr<const ImageContent> content () {
return _image_content;
}
- void seek (ContentTime, bool);
-
private:
bool pass ();
private:
bool pass ();
-
+ void seek (ContentTime, bool);
+
boost::shared_ptr<const ImageContent> _image_content;
boost::shared_ptr<const ImageContent> _image_content;
- boost::shared_ptr<Image> _image;
-
ContentTi
me _video_position;
+ boost::shared_ptr<Image
Proxy
> _image;
+
Fra
me _video_position;
};
};