projects
/
libdcp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make similar changes to the previous commit for _xml_id.
[libdcp.git]
/
src
/
colour_conversion.h
diff --git
a/src/colour_conversion.h
b/src/colour_conversion.h
index 17051bcdd9792ab406e729fb63584368f1ebd82d..83ba3ad32ce9f750a7314318b1eb10f8df2cb020 100644
(file)
--- a/
src/colour_conversion.h
+++ b/
src/colour_conversion.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2014-20
15
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2014-20
21
Carl Hetherington <cth@carlh.net>
This file is part of libdcp.
This file is part of libdcp.
@@
-31,13
+31,16
@@
files in the program, then also delete it here.
*/
files in the program, then also delete it here.
*/
+
/** @file src/colour_conversion.h
* @brief ColourConversion class.
*/
/** @file src/colour_conversion.h
* @brief ColourConversion class.
*/
+
#ifndef DCP_COLOUR_CONVERSION_H
#define DCP_COLOUR_CONVERSION_H
#ifndef DCP_COLOUR_CONVERSION_H
#define DCP_COLOUR_CONVERSION_H
+
#include "chromaticity.h"
#include <memory>
#if BOOST_VERSION >= 106400
#include "chromaticity.h"
#include <memory>
#if BOOST_VERSION >= 106400
@@
-46,25
+49,29
@@
#include <boost/numeric/ublas/matrix.hpp>
#include <boost/optional.hpp>
#include <boost/numeric/ublas/matrix.hpp>
#include <boost/optional.hpp>
+
namespace dcp {
namespace dcp {
+
class TransferFunction;
class TransferFunction;
-enum YUVToRGB {
- YUV_TO_RGB_REC601,
- YUV_TO_RGB_REC709,
- YUV_TO_RGB_COUNT
+
+enum class YUVToRGB {
+ REC601,
+ REC709,
+ COUNT
};
};
+
/** @class ColourConversion
* @brief A representation of all the parameters involved the colourspace conversion
/** @class ColourConversion
* @brief A representation of all the parameters involved the colourspace conversion
- * of a YUV image to XYZ (via RGB)
.
+ * of a YUV image to XYZ (via RGB)
*/
class ColourConversion
{
public:
ColourConversion ()
*/
class ColourConversion
{
public:
ColourConversion ()
- : _yuv_to_rgb (YUV
_TO_RGB_
REC601)
+ : _yuv_to_rgb (YUV
ToRGB::
REC601)
{}
ColourConversion (
{}
ColourConversion (
@@
-175,6
+182,8
@@
protected:
std::shared_ptr<const TransferFunction> _out;
};
std::shared_ptr<const TransferFunction> _out;
};
+
}
}
+
#endif
#endif