summaryrefslogtreecommitdiff
path: root/src/picture_asset.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-10-09 15:26:06 +0100
committerCarl Hetherington <cth@carlh.net>2013-10-09 15:26:06 +0100
commit7f24f3e03420004d62d506e67372991823ce6342 (patch)
tree121dee2ba0949a6e83a621e83a05a3ef314de8de /src/picture_asset.h
parent49291e362d7236f3ea39b297f4f18cf297571f78 (diff)
Try to fix comparison of 3D DCPs.
Diffstat (limited to 'src/picture_asset.h')
-rw-r--r--src/picture_asset.h12
1 files changed, 10 insertions, 2 deletions
diff --git a/src/picture_asset.h b/src/picture_asset.h
index 53231418..7d669eb3 100644
--- a/src/picture_asset.h
+++ b/src/picture_asset.h
@@ -29,6 +29,12 @@
#include "util.h"
#include "metadata.h"
+namespace ASDCP {
+ namespace JP2K {
+ class PictureDescriptor;
+ }
+}
+
namespace libdcp
{
@@ -57,8 +63,6 @@ public:
virtual void create (std::vector<boost::filesystem::path> const &) {}
virtual void create (boost::function<boost::filesystem::path (int)>) {}
- bool equals (boost::shared_ptr<const Asset> other, EqualityOptions opt, boost::function<void (NoteType, std::string)> note) const;
-
Size size () const {
return _size;
}
@@ -76,6 +80,10 @@ protected:
uint8_t const * data_A, unsigned int size_A, uint8_t const * data_B, unsigned int size_B
) const;
+ bool descriptor_equals (
+ ASDCP::JP2K::PictureDescriptor const & a, ASDCP::JP2K::PictureDescriptor const & b, boost::function<void (NoteType, std::string)>
+ ) const;
+
/** picture size in pixels */
Size _size;