summaryrefslogtreecommitdiff
path: root/src/colour_conversion.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2020-12-20 14:14:07 +0100
committerCarl Hetherington <cth@carlh.net>2021-01-08 00:35:29 +0100
commitd39880eef211a296fa8ef4712cdef5945d08527c (patch)
tree45dce8f3e1fd599ca76677e31eee2a71c9a4fbc1 /src/colour_conversion.h
parent75faebaf1d74e2b52360905e94e9f5bf31c34124 (diff)
std::shared_ptr
Diffstat (limited to 'src/colour_conversion.h')
-rw-r--r--src/colour_conversion.h18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/colour_conversion.h b/src/colour_conversion.h
index c6f6f529..17051bcd 100644
--- a/src/colour_conversion.h
+++ b/src/colour_conversion.h
@@ -39,7 +39,7 @@
#define DCP_COLOUR_CONVERSION_H
#include "chromaticity.h"
-#include <boost/shared_ptr.hpp>
+#include <memory>
#if BOOST_VERSION >= 106400
#include <boost/serialization/array_wrapper.hpp>
#endif
@@ -68,17 +68,17 @@ public:
{}
ColourConversion (
- boost::shared_ptr<const TransferFunction> in,
+ std::shared_ptr<const TransferFunction> in,
YUVToRGB yuv_to_rgb,
Chromaticity red,
Chromaticity green,
Chromaticity blue,
Chromaticity white,
boost::optional<Chromaticity> adjusted_white,
- boost::shared_ptr<const TransferFunction> out
+ std::shared_ptr<const TransferFunction> out
);
- boost::shared_ptr<const TransferFunction> in () const {
+ std::shared_ptr<const TransferFunction> in () const {
return _in;
}
@@ -106,11 +106,11 @@ public:
return _adjusted_white;
}
- boost::shared_ptr<const TransferFunction> out () const {
+ std::shared_ptr<const TransferFunction> out () const {
return _out;
}
- void set_in (boost::shared_ptr<const TransferFunction> f) {
+ void set_in (std::shared_ptr<const TransferFunction> f) {
_in = f;
}
@@ -142,7 +142,7 @@ public:
_adjusted_white = boost::optional<Chromaticity> ();
}
- void set_out (boost::shared_ptr<const TransferFunction> f) {
+ void set_out (std::shared_ptr<const TransferFunction> f) {
_out = f;
}
@@ -162,7 +162,7 @@ public:
protected:
/** Input transfer function (probably a gamma function, or something similar) */
- boost::shared_ptr<const TransferFunction> _in;
+ std::shared_ptr<const TransferFunction> _in;
/** Conversion to use from YUV to RGB */
YUVToRGB _yuv_to_rgb;
Chromaticity _red;
@@ -172,7 +172,7 @@ protected:
/** White point that we are adjusting to using a Bradford matrix */
boost::optional<Chromaticity> _adjusted_white;
/** Output transfer function (probably an inverse gamma function, or something similar) */
- boost::shared_ptr<const TransferFunction> _out;
+ std::shared_ptr<const TransferFunction> _out;
};
}