From 4789477e11358ab9243f153985f7b5eaad5ab943 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Fri, 16 Dec 2016 06:09:32 +0100 Subject: mroe testing MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- src/test.c | 192 +++++++++++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 149 insertions(+), 43 deletions(-) diff --git a/src/test.c b/src/test.c index d7e8cf1..1e68344 100644 --- a/src/test.c +++ b/src/test.c @@ -19,7 +19,7 @@ #include -int test_convert_(libcolour_colour_t* c1, libcolour_colour_t* c2, libcolour_colour_t* c3) +static int test_convert(libcolour_colour_t* c1, libcolour_colour_t* c2, libcolour_colour_t* c3) { double ch1, ch2, ch3; if (libcolour_convert(c1, c2)) @@ -32,15 +32,47 @@ int test_convert_(libcolour_colour_t* c1, libcolour_colour_t* c2, libcolour_colo ch1 *= ch1; ch2 *= ch2; ch3 *= ch3; - if (ch1 > 0.0000001 || - ch2 > 0.0000001 || - ch3 > 0.0000001) + switch (c1->model) { + case LIBCOLOUR_CIEXYY: + if (c1->ciexyy.Y == 0) + ch1 = ch2 = 0; + if (c1->ciexyy.y == 0) + ch1 = ch2 = ch3 = 0; + break; + case LIBCOLOUR_CIEXYZ: + if (c1->ciexyz.Y == 0) + ch1 = ch3 = 0; + break; + case LIBCOLOUR_CIE1960UCS: + if (c1->cie1960ucs.v == 0) + ch1 = ch2 = ch3 = 0; + if (c1->cie1960ucs.Y == 0) + ch1 = ch2 = 0; + break; + case LIBCOLOUR_CIEUVW: + if (c1->cieuvw.W == 0) + ch1 = ch2 = 0; + break; + case LIBCOLOUR_CIELCHUV: + if (c1->cielchuv.C == 0) + ch1 = ch3 = 0; + break; + case LIBCOLOUR_CIELAB: + if (c1->cielchuv.L == 0) + ch2 = ch3 = 0; + break; + default: + break; + } + if (ch1 > 0.000001 || + ch2 > 0.000001 || + ch3 > 0.000001) return 0; return 1; } -int test_convert(libcolour_colour_t* c1, libcolour_model_t model) +static int test_convert_11(libcolour_colour_t* c1, libcolour_model_t model) { libcolour_colour_t c2, c3; int r1, r2; @@ -51,13 +83,13 @@ int test_convert(libcolour_colour_t* c1, libcolour_model_t model) c2.rgb.with_gamma = 0; if (libcolour_get_rgb_colour_space(&c2.rgb, LIBCOLOUR_RGB_COLOUR_SPACE_SRGB) < 0) return -1; - return test_convert_(c1, &c2, &c3); + return test_convert(c1, &c2, &c3); case LIBCOLOUR_SRGB: c2.srgb.with_gamma = 0; - if (r1 = test_convert_(c1, &c2, &c3), r1 < 0) + if (r1 = test_convert(c1, &c2, &c3), r1 < 0) return -1; c2.srgb.with_gamma = 1; - if (r2 = test_convert_(c1, &c2, &c3), r2 < 0) + if (r2 = test_convert(c1, &c2, &c3), r2 < 0) return -1; return r1 & r2; case LIBCOLOUR_CIELUV: @@ -66,56 +98,101 @@ int test_convert(libcolour_colour_t* c1, libcolour_model_t model) c2.cieluv.white.X = 1.0294; c2.cieluv.white.Y = 1; c2.cieluv.white.Z = 0.9118; - return test_convert_(c1, &c2, &c3); + return test_convert(c1, &c2, &c3); case LIBCOLOUR_CIEUVW: c2.cieuvw.u0 = 0.37; c2.cieuvw.v0 = 0.30; - return test_convert_(c1, &c2, &c3); + return test_convert(c1, &c2, &c3); default: - return test_convert_(c1, &c2, &c3); + return test_convert(c1, &c2, &c3); } } -int test_convert_all(libcolour_model_t model, const char* model_name) +static int test_convert_1n(libcolour_model_t model, const char* model_name, double ch1, double ch2, double ch3) { libcolour_colour_t c1; - int r, rc = 1; + int run, r, rc = 1; c1.model = model; - c1.srgb.R = 0.2, c1.srgb.G = 0.5, c1.srgb.B = 0.9; - switch (model) { - case LIBCOLOUR_RGB: - c1.rgb.with_gamma = 0; - if (libcolour_get_rgb_colour_space(&c1.rgb, LIBCOLOUR_RGB_COLOUR_SPACE_SRGB) < 0) - return -1; - break; - case LIBCOLOUR_SRGB: - c1.srgb.with_gamma = 0; - break; - case LIBCOLOUR_CIELUV: - case LIBCOLOUR_CIELCHUV: - c1.cieluv.white.model = LIBCOLOUR_CIEXYZ; - c1.cieluv.white.X = 1.0294; - c1.cieluv.white.Y = 1; - c1.cieluv.white.Z = 0.9118; - break; - case LIBCOLOUR_CIEUVW: - c1.cieuvw.u0 = 0.37; - c1.cieuvw.v0 = 0.30; + case LIBCOLOUR_CIELAB: + c1.srgb.R = ch1 * 100, c1.srgb.G = ch2 * 100, c1.srgb.B = ch3 * 100; break; default: + c1.srgb.R = ch1, c1.srgb.G = ch2, c1.srgb.B = ch3; break; } - c1.srgb.with_gamma = 0; + for (run = 0;; run++) { + switch (model) { + case LIBCOLOUR_RGB: + if (run == 2) + return rc; + c1.rgb.with_gamma = run; + if (libcolour_get_rgb_colour_space(&c1.rgb, LIBCOLOUR_RGB_COLOUR_SPACE_SRGB) < 0) + return -1; + break; + case LIBCOLOUR_SRGB: + if (run == 2) + return rc; + c1.srgb.with_gamma = run; + break; + case LIBCOLOUR_CIELUV: + case LIBCOLOUR_CIELCHUV: + c1.cieluv.white.model = LIBCOLOUR_CIEXYZ; + if (run == 0) { + c1.cieluv.white.X = 1.0294; + c1.cieluv.white.Y = 1; + c1.cieluv.white.Z = 0.9118; + } else if (run == 1) { + c1.cieluv.white.X = 1.03; + c1.cieluv.white.Y = 0.8; + c1.cieluv.white.Z = 0.92; + } else { + return rc; + } + break; + case LIBCOLOUR_CIEUVW: + if (run == 0) { + c1.cieuvw.u0 = 0.37; + c1.cieuvw.v0 = 0.30; + } else if (run == 1) { + c1.cieuvw.u0 = 0.47; + c1.cieuvw.v0 = 0.31; + } else { + return rc; + } + break; + default: + if (run == 1) + return rc; + break; + } + #define X(ENUM, TYPE)\ - r = test_convert(&c1, ENUM);\ + r = test_convert_11(&c1, ENUM);\ + if (r < 0)\ + return -1;\ + if (!r)\ + printf("%s -> %s -> %s failed at run %i with (%lf, %lf, %lf)\n",\ + model_name, #ENUM, model_name, run, ch1, ch2, ch3), rc = 0; + LIBCOLOUR_LIST_MODELS; +#undef X + } +} + + +static int test_convert_nm(double ch1, double ch2, double ch3) +{ + int r, rc = 1; + +#define X(ENUM, TYPE)\ + r = test_convert_1n(ENUM, #ENUM, ch1, ch2, ch3);\ if (r < 0)\ return -1;\ if (!r)\ - printf("%s -> %s -> %s failed\n", model_name, #ENUM, model_name), rc = 0; + rc = 0; LIBCOLOUR_LIST_MODELS; #undef X @@ -123,6 +200,38 @@ int test_convert_all(libcolour_model_t model, const char* model_name) } +static int test_convert_nm_all(void) +{ +#define N 11 + int r, rc = 1; + double ch1, ch2, ch3; + int i, j, k; + + for (i = 0; i < N; i++) { + for (j = 0; j < N; j++) { + for (k = 0; k < N; k++) { + ch1 = ((i + N / 2) % N) / (N - 1); + ch2 = ((j + N / 2) % N) / (N - 1); + ch3 = ((k + N / 2) % N) / (N - 1); + + if (ch1 > 0.999) ch1 = 1; + if (ch2 > 0.999) ch2 = 1; + if (ch3 > 0.999) ch3 = 1; + + r = test_convert_nm(ch1, ch2, ch3); + if (r < 0) + return -1; + if (!r) + rc = 0; + } + } + } + + return rc; +#undef N +} + + /** * Test libcolour * @@ -134,14 +243,11 @@ int main(int argc, char* argv[]) { int r, rc = 0; -#define X(ENUM, TYPE)\ - r = test_convert_all(ENUM, #ENUM);\ - if (r < 0)\ - goto fail;\ - if (!r)\ + r = test_convert_nm_all(); + if (r < 0) + goto fail; + if (!r) rc = 1; - LIBCOLOUR_LIST_MODELS; -#undef X return rc; fail: -- cgit v1.2.3-70-g09d2