projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix merge.
[dcpomatic.git]
/
src
/
lib
/
image_decoder.h
diff --git
a/src/lib/image_decoder.h
b/src/lib/image_decoder.h
index 242f69477826a499d915505cd0b9486808aba68d..e2de56acb9b1789f5e0e37a584dc30b88acc8625 100644
(file)
--- a/
src/lib/image_decoder.h
+++ b/
src/lib/image_decoder.h
@@
-19,10
+19,6
@@
#include "video_decoder.h"
#include "video_decoder.h"
-namespace Magick {
- class Image;
-}
-
class ImageContent;
class ImageDecoder : public VideoDecoder
class ImageContent;
class ImageDecoder : public VideoDecoder
@@
-34,13
+30,11
@@
public:
return _image_content;
}
return _image_content;
}
+private:
+ bool pass (PassReason, bool);
void seek (ContentTime, bool);
void seek (ContentTime, bool);
-private:
- bool pass ();
-
boost::shared_ptr<const ImageContent> _image_content;
boost::shared_ptr<ImageProxy> _image;
boost::shared_ptr<const ImageContent> _image_content;
boost::shared_ptr<ImageProxy> _image;
-
Video
Frame _video_position;
+ Frame _video_position;
};
};
-