diff options
| -rw-r--r-- | src/mono_picture_asset.cc | 4 | ||||
| -rw-r--r-- | src/mono_picture_frame.cc | 8 | ||||
| -rw-r--r-- | src/mono_picture_frame.h | 8 | ||||
| -rw-r--r-- | src/verify.cc | 2 | ||||
| -rw-r--r-- | tools/dcpinfo.cc | 6 |
5 files changed, 14 insertions, 14 deletions
diff --git a/src/mono_picture_asset.cc b/src/mono_picture_asset.cc index cb60be6d..1f3dcc9d 100644 --- a/src/mono_picture_asset.cc +++ b/src/mono_picture_asset.cc @@ -148,8 +148,8 @@ MonoPictureAsset::equals (shared_ptr<const Asset> other, EqualityOptions opt, No if (!frame_buffer_equals ( i, opt, bind (&storing_note_handler, boost::ref(notes), _1, _2), - frame_A->j2k_data(), frame_A->j2k_size(), - frame_B->j2k_data(), frame_B->j2k_size() + frame_A->data(), frame_A->size(), + frame_B->data(), frame_B->size() )) { result = false; } diff --git a/src/mono_picture_frame.cc b/src/mono_picture_frame.cc index 7d24ea63..6587a720 100644 --- a/src/mono_picture_frame.cc +++ b/src/mono_picture_frame.cc @@ -63,7 +63,7 @@ MonoPictureFrame::MonoPictureFrame (boost::filesystem::path path) boost::throw_exception (FileError ("could not open JPEG2000 file", path, errno)); } - size_t n = fread (j2k_data(), 1, size, f); + size_t n = fread (data(), 1, size, f); if (n != size) { boost::throw_exception (FileError ("could not read from JPEG2000 file", path, errno)); } @@ -100,21 +100,21 @@ MonoPictureFrame::MonoPictureFrame (uint8_t const * data, int size) /** @return Pointer to JPEG2000 data */ uint8_t const * -MonoPictureFrame::j2k_data () const +MonoPictureFrame::data () const { return _buffer->RoData (); } /** @return Pointer to JPEG2000 data */ uint8_t * -MonoPictureFrame::j2k_data () +MonoPictureFrame::data () { return _buffer->Data (); } /** @return Size of JPEG2000 data in bytes */ int -MonoPictureFrame::j2k_size () const +MonoPictureFrame::size () const { return _buffer->Size (); } 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 diff --git a/src/verify.cc b/src/verify.cc index 55da95b6..0d1907fe 100644 --- a/src/verify.cc +++ b/src/verify.cc @@ -405,7 +405,7 @@ enum VerifyPictureAssetResult int biggest_frame_size (shared_ptr<const MonoPictureFrame> frame) { - return frame->j2k_size (); + return frame->size (); } int diff --git a/tools/dcpinfo.cc b/tools/dcpinfo.cc index 3afff7f0..e8aed3d8 100644 --- a/tools/dcpinfo.cc +++ b/tools/dcpinfo.cc @@ -162,10 +162,10 @@ main_picture (vector<string> const& only, shared_ptr<Reel> reel, bool analyse, b for (int64_t i = 0; i < ma->intrinsic_duration(); ++i) { shared_ptr<const MonoPictureFrame> frame = reader->get_frame (i); if (SHOULD_PICTURE) { - printf("Frame %" PRId64 " J2K size %7d", i, frame->j2k_size()); + printf("Frame %" PRId64 " J2K size %7d", i, frame->size()); } - j2k_size_range.first = min(j2k_size_range.first, frame->j2k_size()); - j2k_size_range.second = max(j2k_size_range.second, frame->j2k_size()); + j2k_size_range.first = min(j2k_size_range.first, frame->size()); + j2k_size_range.second = max(j2k_size_range.second, frame->size()); if (decompress) { try { |