Check for trailing data when loading certificates.

[libdcp.git] / src / rgb_xyz.h

diff --git a/src/rgb_xyz.h b/src/rgb_xyz.h
index 5d1a4d172a8f24807edadbdaf2d68aa1e731ed3a..7bd1cd8eeddce6449362f04aa8fe60d98915a8db 100644 (file)
--- a/src/rgb_xyz.h
+++ b/src/rgb_xyz.h
@@ -24,26 +24,33 @@
 
 namespace dcp {
 
-class ARGBImage;       
-class XYZImage;
+class ARGBImage;
+class OpenJPEGImage;
 class Image;
 class ColourConversion;
-       
+
 extern void xyz_to_rgba (
-       boost::shared_ptr<const XYZImage>,
+       boost::shared_ptr<const OpenJPEGImage>,
        ColourConversion const & conversion,
        uint8_t* rgba
        );
-       
+
 extern void xyz_to_rgb (
-       boost::shared_ptr<const XYZImage>,
+       boost::shared_ptr<const OpenJPEGImage>,
        ColourConversion const & conversion,
        uint8_t* rgb,
        int stride,
        boost::optional<NoteHandler> note = boost::optional<NoteHandler> ()
        );
-       
-extern boost::shared_ptr<XYZImage> rgb_to_xyz (uint8_t const * rgb, dcp::Size size, int stride, ColourConversion const & conversion);
-extern boost::shared_ptr<XYZImage> xyz_to_xyz (uint8_t const * xyz, dcp::Size size, int stride);
-       
+
+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);
+
 }