-
-extern boost::shared_ptr<ARGBFrame> xyz_to_rgba (boost::shared_ptr<const XYZFrame>, ColourConversion const & conversion);
-extern void xyz_to_rgb (boost::shared_ptr<const XYZFrame>, ColourConversion const & conversion, uint8_t* buffer);
-extern boost::shared_ptr<XYZFrame> rgb_to_xyz (boost::shared_ptr<const Image>, ColourConversion const & conversion);
-extern boost::shared_ptr<XYZFrame> xyz_to_xyz (boost::shared_ptr<const Image>);
-
+
+extern void xyz_to_rgba (
+ boost::shared_ptr<const OpenJPEGImage>,
+ ColourConversion const & conversion,
+ uint8_t* rgba
+ );
+
+extern void xyz_to_rgb (
+ boost::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 (
+ uint8_t const * rgb,
+ dcp::Size size,
+ int stride,
+ ColourConversion const & conversion,
+ boost::optional<NoteHandler> note = boost::optional<NoteHandler> ()
+ );
+
+extern boost::shared_ptr<OpenJPEGImage> xyz_to_xyz (uint8_t const * xyz, dcp::Size size, int stride);
+