Merge pull request #5 from Gofilex/increase-max-length

[libdcp.git] / src / rgb_xyz.h

diff --git a/src/rgb_xyz.h b/src/rgb_xyz.h
index 153fedf11223998e929f3131097fc32501cb65c2..652f5522656dbbaf63f5830ce25efe06ed722ae6 100644 (file)
--- a/src/rgb_xyz.h
+++ b/src/rgb_xyz.h
@@ -15,6 +15,20 @@
 
     You should have received a copy of the GNU General Public License
     along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
+
+    In addition, as a special exception, the copyright holders give
+    permission to link the code of portions of this program with the
+    OpenSSL library under certain conditions as described in each
+    individual source file, and distribute linked combinations
+    including the two.
+
+    You must obey the GNU General Public License in all respects
+    for all of the code used other than OpenSSL.  If you modify
+    file(s) with this exception, you may extend this exception to your
+    version of the file(s), but you are not obligated to do so.  If you
+    do not wish to do so, delete this exception statement from your
+    version.  If you delete this exception statement from all source
+    files in the program, then also delete it here.
 */
 
 #include "types.h"
@@ -24,7 +38,6 @@
 
 namespace dcp {
 
-class ARGBImage;
 class OpenJPEGImage;
 class Image;
 class ColourConversion;
@@ -32,7 +45,8 @@ class ColourConversion;
 extern void xyz_to_rgba (
        boost::shared_ptr<const OpenJPEGImage>,
        ColourConversion const & conversion,
-       uint8_t* rgba
+       uint8_t* rgba,
+       int stride
        );
 
 extern void xyz_to_rgb (
@@ -51,6 +65,6 @@ extern boost::shared_ptr<OpenJPEGImage> rgb_to_xyz (
        boost::optional<NoteHandler> note = boost::optional<NoteHandler> ()
        );
 
-extern boost::shared_ptr<OpenJPEGImage> xyz_to_xyz (uint8_t const * xyz, dcp::Size size, int stride);
+extern void combined_rgb_to_xyz (ColourConversion const & conversion, double* matrix);
 
 }