From 06b8e2576f952e8f8b097ee906f662d2ac38e2e8 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Wed, 3 May 2017 20:20:12 +0200 Subject: Add constants D65_XYZ_X and D65_XYZ_Z MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- src/blind-invert-luma.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'src/blind-invert-luma.c') diff --git a/src/blind-invert-luma.c b/src/blind-invert-luma.c index b876967..9a8ac51 100644 --- a/src/blind-invert-luma.c +++ b/src/blind-invert-luma.c @@ -13,17 +13,15 @@ static void process_xyza(struct stream *colour, struct stream *mask, size_t n) { size_t i; - double w, y, yo, X, Z; - X = D65_XYY_X / D65_XYY_Y; - Z = 1 / D65_XYY_Y - 1 - X; + double w, y, yo; for (i = 0; i < n; i += colour->pixel_size) { w = ((double *)(mask->buf + i))[1]; w *= ((double *)(mask->buf + i))[3]; yo = ((double *)(colour->buf + i))[1]; y = (1 - yo) * w + yo * (1 - w); - ((double *)(colour->buf + i))[0] += (y - yo) * X; + ((double *)(colour->buf + i))[0] += (y - yo) * D65_XYZ_X; ((double *)(colour->buf + i))[1] = y; - ((double *)(colour->buf + i))[2] += (y - yo) * Z; + ((double *)(colour->buf + i))[2] += (y - yo) * D65_XYZ_Z; /* * Explaination: * Y is the luma and ((X / Xn - Y / Yn), (Z / Zn - Y / Yn)) @@ -37,17 +35,15 @@ static void process_xyza_i(struct stream *colour, struct stream *mask, size_t n) { size_t i; - double w, y, yo, X, Z; - X = D65_XYY_X / D65_XYY_Y; - Z = 1 / D65_XYY_Y - 1 - X; + double w, y, yo; for (i = 0; i < n; i += colour->pixel_size) { w = 1 - ((double *)(mask->buf + i))[1]; w *= ((double *)(mask->buf + i))[3]; yo = ((double *)(colour->buf + i))[1]; y = (1 - yo) * w + yo * (1 - w); - ((double *)(colour->buf + i))[0] += (y - yo) * X; + ((double *)(colour->buf + i))[0] += (y - yo) * D65_XYZ_X; ((double *)(colour->buf + i))[1] = y; - ((double *)(colour->buf + i))[2] += (y - yo) * Z; + ((double *)(colour->buf + i))[2] += (y - yo) * D65_XYZ_Z; } } -- cgit v1.2.3-70-g09d2