Bv2.1 7.2.3: Check that subtitle <StartTime> exists and is 0.

[libdcp.git] / src / rgb_xyz.h

diff --git a/src/rgb_xyz.h b/src/rgb_xyz.h
index 3f4d790b31493c96d27fa7c4917a2685d39532aa..60df612cf29637af26d26432bd6dc9bafadb8c89 100644 (file)
--- a/src/rgb_xyz.h
+++ b/src/rgb_xyz.h
@@ -32,32 +32,32 @@
 */
 
 #include "types.h"
-#include <boost/shared_ptr.hpp>
+#include <memory>
 #include <boost/optional.hpp>
 #include <stdint.h>
 
 namespace dcp {
 
-class ARGBImage;
 class OpenJPEGImage;
 class Image;
 class ColourConversion;
 
 extern void xyz_to_rgba (
-       boost::shared_ptr<const OpenJPEGImage>,
+       std::shared_ptr<const OpenJPEGImage>,
        ColourConversion const & conversion,
-       uint8_t* rgba
+       uint8_t* rgba,
+       int stride
        );
 
 extern void xyz_to_rgb (
-       boost::shared_ptr<const OpenJPEGImage>,
+       std::shared_ptr<const OpenJPEGImage>,
        ColourConversion const & conversion,
        uint8_t* rgb,
        int stride,
        boost::optional<NoteHandler> note = boost::optional<NoteHandler> ()
        );
 
-extern boost::shared_ptr<OpenJPEGImage> rgb_to_xyz (
+extern std::shared_ptr<OpenJPEGImage> rgb_to_xyz (
        uint8_t const * rgb,
        dcp::Size size,
        int stride,
@@ -65,6 +65,6 @@ extern boost::shared_ptr<OpenJPEGImage> rgb_to_xyz (
        boost::optional<NoteHandler> note = boost::optional<NoteHandler> ()
        );
 
-extern boost::shared_ptr<OpenJPEGImage> xyz_to_xyz (uint8_t const * xyz, dcp::Size size, int stride);
+extern void combined_rgb_to_xyz (ColourConversion const & conversion, double* matrix);
 
 }