summaryrefslogtreecommitdiff
path: root/src/mono_picture_frame.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2020-11-01 22:42:36 +0100
committerCarl Hetherington <cth@carlh.net>2020-11-02 00:12:56 +0100
commit9842de679ebca9783b9e8b4705e4fe2a1ebb81fa (patch)
tree929f9fda409c5b63f39d5d70659b47ae97749ab9 /src/mono_picture_frame.h
parent2f36b781966dafa6931bdb52402903006edabb69 (diff)
Make MonoPictureAsset implement the Data interface.
Diffstat (limited to 'src/mono_picture_frame.h')
-rw-r--r--src/mono_picture_frame.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mono_picture_frame.h b/src/mono_picture_frame.h
index caa279d2..27d52833 100644
--- a/src/mono_picture_frame.h
+++ b/src/mono_picture_frame.h
@@ -62,7 +62,7 @@ class OpenJPEGImage;
/** @class MonoPictureFrame
* @brief A single frame of a 2D (monoscopic) picture asset.
*/
-class MonoPictureFrame : public boost::noncopyable
+class MonoPictureFrame : public Data, public boost::noncopyable
{
public:
explicit MonoPictureFrame (boost::filesystem::path path);
@@ -70,9 +70,9 @@ public:
boost::shared_ptr<OpenJPEGImage> xyz_image (int reduce = 0) const;
- uint8_t const * j2k_data () const;
- uint8_t* j2k_data ();
- int j2k_size () const;
+ uint8_t const * data () const;
+ uint8_t* data ();
+ int size () const;
private:
/* XXX: this is a bit of a shame, but I tried friend MonoPictureAssetReader and it's