Skip to content

Commit 006c53b

Browse files
committed
Add ROMM->CIE-XYZ builtin and update tests
Register ROMM_to_CIE-XYZ-D65_BFD and LINEAR-RIMM_to_ACES2065-1_BFD in Config version checks, correct ProPhotoRGB builtin to target CIE XYZ D65 (update comments/registration string), and adjust unit test expected values for ROMM_to_CIE-XYZ-D65_BFD to match the corrected conversion. Signed-off-by: Vlad (Kuzmin) Erium <libalias@gmail.com>
1 parent 16b9a1d commit 006c53b

3 files changed

Lines changed: 7 additions & 5 deletions

File tree

src/OpenColorIO/Config.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5647,6 +5647,8 @@ void Config::Impl::checkVersionConsistency(ConstTransformRcPtr & transform) cons
56475647
|| 0 == Platform::Strcasecmp(blt->getStyle(), "ACES-OUTPUT - ACES2065-1_to_CIE-XYZ-D65 - HDR-1000nit-REC2020-D60-in-REC2020-D65_2.0")
56485648
|| 0 == Platform::Strcasecmp(blt->getStyle(), "ACES-OUTPUT - ACES2065-1_to_CIE-XYZ-D65 - HDR-2000nit-REC2020-D60-in-REC2020-D65_2.0")
56495649
|| 0 == Platform::Strcasecmp(blt->getStyle(), "ACES-OUTPUT - ACES2065-1_to_CIE-XYZ-D65 - HDR-4000nit-REC2020-D60-in-REC2020-D65_2.0")
5650+
|| 0 == Platform::Strcasecmp(blt->getStyle(), "ROMM_to_CIE-XYZ-D65_BFD")
5651+
|| 0 == Platform::Strcasecmp(blt->getStyle(), "LINEAR-RIMM_to_ACES2065-1_BFD")
56505652
// NB: This one was added in OCIO 2.4.1.
56515653
|| 0 == Platform::Strcasecmp(blt->getStyle(), "DISPLAY - CIE-XYZ-D65_to_DisplayP3-HDR") )
56525654
)

src/OpenColorIO/transforms/builtins/ProPhotoRGB.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,22 +106,22 @@ namespace OCIO_NAMESPACE
106106
LINEAR_RIMM_to_ACES2065_1_BFD_Functor);
107107
}
108108

109-
// Encoded ProPhoto RGB (gamma 1.8) to ACES2065-1.
109+
// Encoded ProPhoto RGB (gamma 1.8) to CIE XYZ D65.
110110
{
111111
auto ROMM_to_CIE_XYZ_D65_BFD_Functor = [](OpRcPtrVec& ops)
112112
{
113113
// 1. Decode gamma 1.8 to linear.
114114
ROMM_RGB_GAMMA_18::GenerateEncodedToLinearOps(ops);
115115

116-
// 2. Convert color space from ROMM RGB (D50) to ACES AP0 (D60).
116+
// 2. Convert color space from ROMM RGB (D50) to CIE XYZ D65.
117117
MatrixOpData::MatrixArrayPtr matrix
118118
= build_conversion_matrix_to_XYZ_D65(ROMM_RGB::primaries,
119119
ADAPTATION_BRADFORD);
120120
CreateMatrixOp(ops, matrix, TRANSFORM_DIR_FORWARD);
121121
};
122122

123123
registry.addBuiltin("ROMM_to_CIE-XYZ-D65_BFD",
124-
"Convert ProPhoto RGB (gamma 1.8 encoded) to ACES2065-1",
124+
"Convert ProPhoto RGB (gamma 1.8 encoded) to CIE XYZ D65",
125125
ROMM_to_CIE_XYZ_D65_BFD_Functor);
126126
}
127127

tests/cpu/transforms/BuiltinTransform_tests.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -723,8 +723,8 @@ AllValues UnitTestValues
723723
{ 0.5649694f, 0.4038837f, 0.3751478f, -0.505630434f, 0.738133013f, 0.251128823f } } },
724724
{ "ROMM_to_CIE-XYZ-D65_BFD",
725725
{ 1.0e-6f,
726-
{ 0.5f, 0.4f, 0.3f, 0.248054f, 0.216383f, 0.124372f },
727-
{ 0.03f, 0.02f, 0.01f, 0.00160897f, 0.00140735f, 0.000677473f } } },
726+
{ 0.5f, 0.4f, 0.3f, 0.03f, 0.02f, 0.01f},
727+
{ 0.248033493677f, 0.216374642372f, 0.124341066020f, 0.001608840857f, 0.001407296790f, 0.000677302006f} } },
728728
{ "LINEAR-RIMM_to_ACES2065-1_BFD",
729729
{ 1.0e-6f,
730730
{0.5f, 0.4f, 0.3f}, {0.47351069f, 0.39131449f, 0.29965645f} } }

0 commit comments

Comments
 (0)