Actually turn on HMAC use.

[libdcp.git] / src / rgb_xyz.h

diff --git a/src/rgb_xyz.h b/src/rgb_xyz.h
index 53568350973a201984ac674b9c99c2c57968f4e1..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
@@ -24,19 +24,33 @@
 
 namespace dcp {
 
-class ARGBFrame;       
-class XYZFrame;
+class ARGBImage;
+class OpenJPEGImage;
 class Image;
 class ColourConversion;
-       
-extern boost::shared_ptr<ARGBFrame> xyz_to_rgba (boost::shared_ptr<const XYZFrame>, ColourConversion const & conversion);
+
+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 OpenJPEGImage>,
+       ColourConversion const & conversion,
+       uint8_t* rgb,
+       int stride,
+       boost::optional<NoteHandler> note = boost::optional<NoteHandler> ()
+       );
+
+extern boost::shared_ptr<OpenJPEGImage> rgb_to_xyz (
+       uint8_t const * rgb,
+       dcp::Size size,
+       int stride,
        ColourConversion const & conversion,
-       uint16_t* buffer,
        boost::optional<NoteHandler> note = boost::optional<NoteHandler> ()
        );
-extern boost::shared_ptr<XYZFrame> rgb_to_xyz (boost::shared_ptr<const Image>, ColourConversion const & conversion);
-extern boost::shared_ptr<XYZFrame> xyz_to_xyz (boost::shared_ptr<const Image>);
-       
+
+extern boost::shared_ptr<OpenJPEGImage> xyz_to_xyz (uint8_t const * xyz, dcp::Size size, int stride);
+
 }