X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fimage_decoder.h;h=4d96306a89c63775121f4e243da36ce2aa507372;hb=a9370ddf1d55ca01307c086950d2294611d9e6a6;hp=242f69477826a499d915505cd0b9486808aba68d;hpb=8d58a7c5f4320ad5c111e336c45e44d6b51ab509;p=dcpomatic.git diff --git a/src/lib/image_decoder.h b/src/lib/image_decoder.h index 242f69477..4d96306a8 100644 --- a/src/lib/image_decoder.h +++ b/src/lib/image_decoder.h @@ -19,10 +19,6 @@ #include "video_decoder.h" -namespace Magick { - class Image; -} - class ImageContent; class ImageDecoder : public VideoDecoder @@ -34,13 +30,12 @@ public: return _image_content; } - void seek (ContentTime, bool); - private: bool pass (); - + void seek (ContentTime, bool); + boost::shared_ptr _image_content; boost::shared_ptr _image; - VideoFrame _video_position; + Frame _video_position; };