From 338d727d9969f38d241c93ad63917cd430d28b55 Mon Sep 17 00:00:00 2001 From: Pekka Paalanen Date: Wed, 23 Apr 2025 17:08:11 +0300 Subject: [PATCH] tests: drop EOTF from TRANSFER_FN_SRGB_EOTF The sRGB display uses a power-2.2 transfer characteristic. These enum values refer to the two-piece sRGB transfer function instead, so they should not be named "EOTF". Signed-off-by: Pekka Paalanen --- tests/color-icc-output-test.c | 8 ++++---- tests/color-management-test.c | 4 ++-- tests/color_util.c | 36 +++++++++++++++++------------------ tests/color_util.h | 4 ++-- tests/lcms-util-test.c | 4 ++-- tests/lcms_util.c | 4 ++-- 6 files changed, 30 insertions(+), 30 deletions(-) diff --git a/tests/color-icc-output-test.c b/tests/color-icc-output-test.c index 34a954aab..e0c34afeb 100644 --- a/tests/color-icc-output-test.c +++ b/tests/color-icc-output-test.c @@ -57,9 +57,9 @@ const struct lcms_pipeline pipeline_sRGB = { .Green = { 0.300, 0.600, 1.0 }, .Blue = { 0.150, 0.060, 1.0 } }, - .pre_fn = TRANSFER_FN_SRGB_EOTF, + .pre_fn = TRANSFER_FN_SRGB, .mat = WESTON_MAT3F_IDENTITY, - .post_fn = TRANSFER_FN_SRGB_EOTF_INVERSE + .post_fn = TRANSFER_FN_SRGB_INVERSE }; const struct lcms_pipeline pipeline_adobeRGB = { @@ -69,7 +69,7 @@ const struct lcms_pipeline pipeline_adobeRGB = { .Green = { 0.210, 0.710, 1.0 }, .Blue = { 0.150, 0.060, 1.0 } }, - .pre_fn = TRANSFER_FN_SRGB_EOTF, + .pre_fn = TRANSFER_FN_SRGB, .mat = WESTON_MAT3F( 0.715127, 0.284868, 0.000005, 0.000001, 0.999995, 0.000004, @@ -84,7 +84,7 @@ const struct lcms_pipeline pipeline_BT2020 = { .Green = { 0.170, 0.797, 1.0 }, .Blue = { 0.131, 0.046, 1.0 } }, - .pre_fn = TRANSFER_FN_SRGB_EOTF, + .pre_fn = TRANSFER_FN_SRGB, .mat = WESTON_MAT3F( 0.627402, 0.329292, 0.043306, 0.069095, 0.919544, 0.011360, diff --git a/tests/color-management-test.c b/tests/color-management-test.c index 93bccb173..5cd618dde 100644 --- a/tests/color-management-test.c +++ b/tests/color-management-test.c @@ -61,9 +61,9 @@ const struct lcms_pipeline pipeline_sRGB = { .Green = { 0.300, 0.600, 1.0 }, .Blue = { 0.150, 0.060, 1.0 } }, - .pre_fn = TRANSFER_FN_SRGB_EOTF, + .pre_fn = TRANSFER_FN_SRGB, .mat = WESTON_MAT3F_IDENTITY, - .post_fn = TRANSFER_FN_SRGB_EOTF_INVERSE + .post_fn = TRANSFER_FN_SRGB_INVERSE }; struct image_description { diff --git a/tests/color_util.c b/tests/color_util.c index 5112798b1..569e1eec6 100644 --- a/tests/color_util.c +++ b/tests/color_util.c @@ -59,8 +59,8 @@ struct color_tone_curve { /* Mapping from enum transfer_fn to LittleCMS curve parameters. */ const struct color_tone_curve arr_curves[] = { { - .fn = TRANSFER_FN_SRGB_EOTF, - .inv_fn = TRANSFER_FN_SRGB_EOTF_INVERSE, + .fn = TRANSFER_FN_SRGB, + .inv_fn = TRANSFER_FN_SRGB_INVERSE, .internal_type = 4, .param = { 2.4, 1. / 1.055, 0.055 / 1.055, 1. / 12.92, 0.04045 }, }, @@ -113,10 +113,10 @@ transfer_fn_invert(enum transfer_fn fn) return TRANSFER_FN_POWER2_4_EOTF_INVERSE; case TRANSFER_FN_POWER2_4_EOTF_INVERSE: return TRANSFER_FN_POWER2_4_EOTF; - case TRANSFER_FN_SRGB_EOTF: - return TRANSFER_FN_SRGB_EOTF_INVERSE; - case TRANSFER_FN_SRGB_EOTF_INVERSE: - return TRANSFER_FN_SRGB_EOTF; + case TRANSFER_FN_SRGB: + return TRANSFER_FN_SRGB_INVERSE; + case TRANSFER_FN_SRGB_INVERSE: + return TRANSFER_FN_SRGB; } test_assert_not_reached("bad transfer_fn"); return 0; @@ -136,10 +136,10 @@ transfer_fn_name(enum transfer_fn fn) return "power 2.4"; case TRANSFER_FN_POWER2_4_EOTF_INVERSE: return "inverse power 2.4"; - case TRANSFER_FN_SRGB_EOTF: - return "sRGB EOTF"; - case TRANSFER_FN_SRGB_EOTF_INVERSE: - return "inverse sRGB EOTF"; + case TRANSFER_FN_SRGB: + return "sRGB two-piece"; + case TRANSFER_FN_SRGB_INVERSE: + return "inverse sRGB two-piece"; } test_assert_not_reached("bad transfer_fn"); return 0; @@ -166,7 +166,7 @@ ensure_unit_range(float v) } static float -sRGB_EOTF(float e) +sRGB_two_piece(float e) { e = ensure_unit_range(e); if (e <= 0.04045) @@ -176,7 +176,7 @@ sRGB_EOTF(float e) } static float -sRGB_EOTF_inv(float o) +sRGB_two_piece_inv(float o) { o = ensure_unit_range(o); if (o <= 0.04045 / 12.92) @@ -222,11 +222,11 @@ apply_tone_curve(enum transfer_fn fn, float r) case TRANSFER_FN_IDENTITY: ret = r; break; - case TRANSFER_FN_SRGB_EOTF: - ret = sRGB_EOTF(r); + case TRANSFER_FN_SRGB: + ret = sRGB_two_piece(r); break; - case TRANSFER_FN_SRGB_EOTF_INVERSE: - ret = sRGB_EOTF_inv(r); + case TRANSFER_FN_SRGB_INVERSE: + ret = sRGB_two_piece_inv(r); break; case TRANSFER_FN_ADOBE_RGB_EOTF: ret = AdobeRGB_EOTF(r); @@ -272,13 +272,13 @@ color_float_apply_curve(enum transfer_fn fn, struct color_float c) void sRGB_linearize(struct color_float *cf) { - *cf = color_float_apply_curve(TRANSFER_FN_SRGB_EOTF, *cf); + *cf = color_float_apply_curve(TRANSFER_FN_SRGB, *cf); } void sRGB_delinearize(struct color_float *cf) { - *cf = color_float_apply_curve(TRANSFER_FN_SRGB_EOTF_INVERSE, *cf); + *cf = color_float_apply_curve(TRANSFER_FN_SRGB_INVERSE, *cf); } struct color_float diff --git a/tests/color_util.h b/tests/color_util.h index 4785ab7e8..f7b3a2096 100644 --- a/tests/color_util.h +++ b/tests/color_util.h @@ -52,8 +52,8 @@ struct color_float { enum transfer_fn { TRANSFER_FN_IDENTITY, - TRANSFER_FN_SRGB_EOTF, - TRANSFER_FN_SRGB_EOTF_INVERSE, + TRANSFER_FN_SRGB, + TRANSFER_FN_SRGB_INVERSE, TRANSFER_FN_ADOBE_RGB_EOTF, TRANSFER_FN_ADOBE_RGB_EOTF_INVERSE, TRANSFER_FN_POWER2_4_EOTF, diff --git a/tests/lcms-util-test.c b/tests/lcms-util-test.c index c483bb24d..96fb60ad9 100644 --- a/tests/lcms-util-test.c +++ b/tests/lcms-util-test.c @@ -51,8 +51,8 @@ compare_pipeline_to_transfer_fn(cmsPipeline *pipeline, enum transfer_fn fn, } static const enum transfer_fn build_MPE_curves_test_set[] = { - TRANSFER_FN_SRGB_EOTF, - TRANSFER_FN_SRGB_EOTF_INVERSE, + TRANSFER_FN_SRGB, + TRANSFER_FN_SRGB_INVERSE, TRANSFER_FN_ADOBE_RGB_EOTF, TRANSFER_FN_ADOBE_RGB_EOTF_INVERSE, TRANSFER_FN_POWER2_4_EOTF, diff --git a/tests/lcms_util.c b/tests/lcms_util.c index 6dd73afea..58c4674f4 100644 --- a/tests/lcms_util.c +++ b/tests/lcms_util.c @@ -179,9 +179,9 @@ build_MPE_curve(cmsContext ctx, enum transfer_fn fn) return build_MPE_curve_power(ctx, 2.4); case TRANSFER_FN_POWER2_4_EOTF_INVERSE: return build_MPE_curve_power(ctx, 1.0 / 2.4); - case TRANSFER_FN_SRGB_EOTF: + case TRANSFER_FN_SRGB: return build_MPE_curve_sRGB(ctx); - case TRANSFER_FN_SRGB_EOTF_INVERSE: + case TRANSFER_FN_SRGB_INVERSE: return build_MPE_curve_sRGB_inv(ctx); default: test_assert_not_reached("unimplemented MPE curve");