Try to fix comparison of encrypted sound assets.

[libdcp.git] / src / rgb_xyz.h

diff --git a/src/rgb_xyz.h b/src/rgb_xyz.h
index 28e09230abe1a912ad03e6f2d4927794a507ccc8..7bd1cd8eeddce6449362f04aa8fe60d98915a8db 100644 (file)
--- a/src/rgb_xyz.h
+++ b/src/rgb_xyz.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,21 +17,40 @@
 
 */
 
+#include "types.h"
 #include <boost/shared_ptr.hpp>
+#include <boost/optional.hpp>
+#include <stdint.h>
 
 namespace dcp {
 
-class ARGBFrame;       
-class XYZFrame;
-class GammaLUT;
+class ARGBImage;
+class OpenJPEGImage;
 class Image;
-       
-extern boost::shared_ptr<ARGBFrame> xyz_to_rgb (
-       boost::shared_ptr<const XYZFrame>, boost::shared_ptr<const GammaLUT>, boost::shared_ptr<const GammaLUT>
+class ColourConversion;
+
+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<XYZFrame> rgb_to_xyz (
-       boost::shared_ptr<const Image>, boost::shared_ptr<const GammaLUT>, boost::shared_ptr<const GammaLUT>, double const colour_matrix[3][3]
+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);
+
 }