Bump libcxml.

[libdcp.git] / src / stereo_picture_frame.h

diff --git a/src/stereo_picture_frame.h b/src/stereo_picture_frame.h
index 14c94e2e1454af1c130f4a3cd719b4b263c07fe4..a173b1c14cc7e36c50657b2900358c6f7318c48c 100644 (file)
--- a/src/stereo_picture_frame.h
+++ b/src/stereo_picture_frame.h
@@ -31,8 +31,11 @@
     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 "stereo_picture_asset_reader.h"
+#include "asset_reader.h"
 #include <boost/shared_ptr.hpp>
 #include <boost/noncopyable.hpp>
 #include <boost/filesystem.hpp>
@@ -50,7 +53,6 @@ namespace ASDCP {
 namespace dcp {
 
 class OpenJPEGImage;
-class DecryptionContext;
 
 /** A single frame of a 3D (stereoscopic) picture asset */
 class StereoPictureFrame : public boost::noncopyable
@@ -73,7 +75,7 @@ private:
        /* XXX: this is a bit of a shame, but I tried friend StereoPictureAssetReader and it's
           rejected by some (seemingly older) GCCs.
        */
-       friend AssetReader<ASDCP::JP2K::MXFSReader, StereoPictureFrame>;
+       friend class AssetReader<ASDCP::JP2K::MXFSReader, StereoPictureFrame>;
 
        StereoPictureFrame (ASDCP::JP2K::MXFSReader* reader, int n, boost::shared_ptr<DecryptionContext>);
 
@@ -81,3 +83,5 @@ private:
 };
 
 }
+
+#endif