X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Frgb_xyz.h;h=7bd1cd8eeddce6449362f04aa8fe60d98915a8db;hb=1caefd8541e12e7d205c3d5bb46f3ec84719baa0;hp=ee354d5346712b6ff10aa9a4939bd92671084c56;hpb=205fd96fc2592d5b50c91871fe0f2bd9d79783c5;p=libdcp.git

diff --git a/src/rgb_xyz.h b/src/rgb_xyz.h
index ee354d53..7bd1cd8e 100644
--- 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,26 +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_rgba (
-	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 XYZFrame>, boost::shared_ptr<const GammaLUT>, boost::shared_ptr<const GammaLUT>, uint8_t* buffer
+	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);
+
 }