projects
/
libdcp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix build with newer boost.
[libdcp.git]
/
src
/
stereo_picture_frame.h
diff --git
a/src/stereo_picture_frame.h
b/src/stereo_picture_frame.h
index 65e1cea38ee04fa6dfd46e484412fc27a5ca217c..a173b1c14cc7e36c50657b2900358c6f7318c48c 100644
(file)
--- a/
src/stereo_picture_frame.h
+++ b/
src/stereo_picture_frame.h
@@
-31,7
+31,11
@@
files in the program, then also delete it here.
*/
files in the program, then also delete it here.
*/
+#ifndef LIBDCP_STEREO_PICTURE_FRAME_H
+#define LIBDCP_STEREO_PICTURE_FRAME_H
+
#include "types.h"
#include "types.h"
+#include "asset_reader.h"
#include <boost/shared_ptr.hpp>
#include <boost/noncopyable.hpp>
#include <boost/filesystem.hpp>
#include <boost/shared_ptr.hpp>
#include <boost/noncopyable.hpp>
#include <boost/filesystem.hpp>
@@
-49,7
+53,6
@@
namespace ASDCP {
namespace dcp {
class OpenJPEGImage;
namespace dcp {
class OpenJPEGImage;
-class DecryptionContext;
/** A single frame of a 3D (stereoscopic) picture asset */
class StereoPictureFrame : public boost::noncopyable
/** A single frame of a 3D (stereoscopic) picture asset */
class StereoPictureFrame : public boost::noncopyable
@@
-69,7
+72,10
@@
public:
int right_j2k_size () const;
private:
int right_j2k_size () const;
private:
- friend class StereoPictureAssetReader;
+ /* XXX: this is a bit of a shame, but I tried friend StereoPictureAssetReader and it's
+ rejected by some (seemingly older) GCCs.
+ */
+ friend class AssetReader<ASDCP::JP2K::MXFSReader, StereoPictureFrame>;
StereoPictureFrame (ASDCP::JP2K::MXFSReader* reader, int n, boost::shared_ptr<DecryptionContext>);
StereoPictureFrame (ASDCP::JP2K::MXFSReader* reader, int n, boost::shared_ptr<DecryptionContext>);
@@
-77,3
+83,5
@@
private:
};
}
};
}
+
+#endif