summaryrefslogtreecommitdiff
path: root/src/colour_conversion.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2016-12-14 14:48:06 +0000
committerCarl Hetherington <cth@carlh.net>2016-12-14 14:48:06 +0000
commitacf18ab61ce7cd1ba1b72b9451b14b3fc353e2fd (patch)
treef3bdddae1d6eadc86b1fd0e66688318cc5240573 /src/colour_conversion.cc
parent0fee90e0af6fc8dec76450b75d1648d325cc57ca (diff)
Add function for D65 white point.
Diffstat (limited to 'src/colour_conversion.cc')
-rw-r--r--src/colour_conversion.cc15
1 files changed, 5 insertions, 10 deletions
diff --git a/src/colour_conversion.cc b/src/colour_conversion.cc
index aa22a615..16915c72 100644
--- a/src/colour_conversion.cc
+++ b/src/colour_conversion.cc
@@ -53,8 +53,7 @@ ColourConversion::srgb_to_xyz ()
Chromaticity (0.64, 0.33),
Chromaticity (0.3, 0.6),
Chromaticity (0.15, 0.06),
- /* D65 */
- Chromaticity (0.3127, 0.329),
+ Chromaticity::D65 (),
optional<Chromaticity> (),
shared_ptr<const TransferFunction> (new GammaTransferFunction (2.6))
);
@@ -70,8 +69,7 @@ ColourConversion::rec601_to_xyz ()
Chromaticity (0.64, 0.33),
Chromaticity (0.3, 0.6),
Chromaticity (0.15, 0.06),
- /* D65 */
- Chromaticity (0.3127, 0.329),
+ Chromaticity::D65 (),
optional<Chromaticity> (),
shared_ptr<const TransferFunction> (new GammaTransferFunction (2.6))
);
@@ -87,8 +85,7 @@ ColourConversion::rec709_to_xyz ()
Chromaticity (0.64, 0.33),
Chromaticity (0.3, 0.6),
Chromaticity (0.15, 0.06),
- /* D65 */
- Chromaticity (0.3127, 0.329),
+ Chromaticity::D65 (),
optional<Chromaticity> (),
shared_ptr<const TransferFunction> (new GammaTransferFunction (2.6))
);
@@ -123,8 +120,7 @@ ColourConversion::rec1886_to_xyz ()
Chromaticity (0.64, 0.33),
Chromaticity (0.3, 0.6),
Chromaticity (0.15, 0.06),
- /* D65 */
- Chromaticity (0.3127, 0.329),
+ Chromaticity::D65 (),
optional<Chromaticity> (),
shared_ptr<const TransferFunction> (new GammaTransferFunction (2.6))
);
@@ -140,8 +136,7 @@ ColourConversion::rec2020_to_xyz ()
Chromaticity (0.708, 0.292),
Chromaticity (0.170, 0.797),
Chromaticity (0.131, 0.046),
- /* D65 */
- Chromaticity (0.3127, 0.329),
+ Chromaticity::D65 (),
optional<Chromaticity> (),
shared_ptr<const TransferFunction> (new GammaTransferFunction (2.6))
);