X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Frgb_xyz.h;h=7bd1cd8eeddce6449362f04aa8fe60d98915a8db;hb=1caefd8541e12e7d205c3d5bb46f3ec84719baa0;hp=d85e5a1f55a8f315a8123ca189c8b7076b036375;hpb=5c86ba1faafe08d8777ac934655b3444a6b62cbf;p=libdcp.git diff --git a/src/rgb_xyz.h b/src/rgb_xyz.h index d85e5a1f..7bd1cd8e 100644 --- a/src/rgb_xyz.h +++ b/src/rgb_xyz.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2013 Carl Hetherington + Copyright (C) 2013-2015 Carl Hetherington 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 +#include +#include -namespace libdcp { +namespace dcp { -class ARGBFrame; -class XYZFrame; -class LUT; +class ARGBImage; +class OpenJPEGImage; class Image; - -extern boost::shared_ptr xyz_to_rgb ( - boost::shared_ptr, boost::shared_ptr, boost::shared_ptr +class ColourConversion; + +extern void xyz_to_rgba ( + boost::shared_ptr, + ColourConversion const & conversion, + uint8_t* rgba + ); + +extern void xyz_to_rgb ( + boost::shared_ptr, + ColourConversion const & conversion, + uint8_t* rgb, + int stride, + boost::optional note = boost::optional () ); -extern boost::shared_ptr rgb_to_xyz ( - boost::shared_ptr, boost::shared_ptr, boost::shared_ptr, float const colour_matrix[3][3] +extern boost::shared_ptr rgb_to_xyz ( + uint8_t const * rgb, + dcp::Size size, + int stride, + ColourConversion const & conversion, + boost::optional note = boost::optional () ); - + +extern boost::shared_ptr xyz_to_xyz (uint8_t const * xyz, dcp::Size size, int stride); + }