X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fimage_decoder.h;h=4d96306a89c63775121f4e243da36ce2aa507372;hb=526fd6de4c80a7ac9614a1cb0209efff7b171cd5;hp=242f69477826a499d915505cd0b9486808aba68d;hpb=04533b9cf34ce8089113015715083ee9c5b2b001;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; };