diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-05-19 11:05:10 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-05-19 11:05:10 +0100 |
| commit | 9e758fddfb8bbadb1fc84e393daa815445d5e9d5 (patch) | |
| tree | 291005ebf01a66f07ab05b09e72f634ddd1ac45a /src/lib/image_decoder.h | |
| parent | 362ed9ee4f73bee21b3ef8d3b449bb8e8877f501 (diff) | |
| parent | 69c08e8bbd5028a65cbddd2aa5f10632bd059191 (diff) | |
Merge delay-decode-take2 branch into master.
Diffstat (limited to 'src/lib/image_decoder.h')
| -rw-r--r-- | src/lib/image_decoder.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/image_decoder.h b/src/lib/image_decoder.h index c7500243e..5b82dd85c 100644 --- a/src/lib/image_decoder.h +++ b/src/lib/image_decoder.h @@ -42,6 +42,6 @@ public: private: boost::shared_ptr<const ImageContent> _image_content; - boost::shared_ptr<Image> _image; + boost::shared_ptr<ImageProxy> _image; }; |