Move convert_to_xyz out of DCPVideo.

[dcpomatic.git] / src / lib / colour_conversion.h

diff --git a/src/lib/colour_conversion.h b/src/lib/colour_conversion.h
index eaf43f59218bb701e5b7f68b5324da8223f7e275..66726f492dcd4f93c737d592a5581b239b611848 100644 (file)
--- a/src/lib/colour_conversion.h
+++ b/src/lib/colour_conversion.h
@@ -1,44 +1,58 @@
 /*
     Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
+
 #ifndef DCPOMATIC_COLOUR_CONVERSION_H
 #define DCPOMATIC_COLOUR_CONVERSION_H
 
+
 /* Hack for OS X compile failure; see https://bugs.launchpad.net/hugin/+bug/910160 */
 #ifdef check
 #undef check
 #endif
 
+
 #include <dcp/colour_conversion.h>
+#include <dcp/types.h>
 #include <libcxml/cxml.h>
-#include <boost/utility.hpp>
+
 
 namespace xmlpp {
        class Node;
 }
 
+namespace dcp {
+       class OpenJPEGImage;
+}
+
+
+class PlayerVideo;
+
+
 class ColourConversion : public dcp::ColourConversion
 {
 public:
        ColourConversion ();
-       ColourConversion (dcp::ColourConversion);
+       explicit ColourConversion (dcp::ColourConversion);
        ColourConversion (cxml::NodePtr, int version);
+       virtual ~ColourConversion () {}
 
        virtual void as_xml (xmlpp::Node *) const;
        std::string identifier () const;
@@ -76,4 +90,8 @@ bool operator== (ColourConversion const &, ColourConversion const &);
 bool operator!= (ColourConversion const &, ColourConversion const &);
 bool operator== (PresetColourConversion const &, PresetColourConversion const &);
 
+
+extern std::shared_ptr<dcp::OpenJPEGImage> convert_to_xyz (std::shared_ptr<const PlayerVideo> frame, dcp::NoteHandler note);
+
+
 #endif