add tests, fixes errors, and improve percision

Signed-off-by: Mattias Andrée <maandree@kth.se>

1 files changed, 43 insertions, 41 deletions

diff --git a/src/libcolour.h b/src/libcolour.h
index c68cf11..fe53a4e 100644
--- a/src/libcolour.h
+++ b/src/libcolour.h
@@ -22,47 +22,49 @@
 
 
 
-#define LIBCOLOUR_ILLUMINANT_A    (libcolour_ciexyy_t){.model = LIBCOLOUR_CIEXYY, .x = 0.44757, .y = 0.40745, .Y = 1}
-#define LIBCOLOUR_ILLUMINANT_B    (libcolour_ciexyy_t){.model = LIBCOLOUR_CIEXYY, .x = 0.34842, .y = 0.35161, .Y = 1}
-#define LIBCOLOUR_ILLUMINANT_C    (libcolour_ciexyy_t){.model = LIBCOLOUR_CIEXYY, .x = 0.31006, .y = 0.31616, .Y = 1}
-#define LIBCOLOUR_ILLUMINANT_D50  (libcolour_ciexyy_t){.model = LIBCOLOUR_CIEXYY, .x = 0.34567, .y = 0.35850, .Y = 1}
-#define LIBCOLOUR_ILLUMINANT_D55  (libcolour_ciexyy_t){.model = LIBCOLOUR_CIEXYY, .x = 0.33242, .y = 0.34743, .Y = 1}
-#define LIBCOLOUR_ILLUMINANT_D65  (libcolour_ciexyy_t){.model = LIBCOLOUR_CIEXYY, .x = 0.31271, .y = 0.32902, .Y = 1}
-#define LIBCOLOUR_ILLUMINANT_D75  (libcolour_ciexyy_t){.model = LIBCOLOUR_CIEXYY, .x = 0.29902, .y = 0.31485, .Y = 1}
-#define LIBCOLOUR_ILLUMINANT_E    (libcolour_ciexyy_t){.model = LIBCOLOUR_CIEXYY, .x = 1. / 3,  .y = 1. / 3,  .Y = 1}
-#define LIBCOLOUR_ILLUMINANT_F1   (libcolour_ciexyy_t){.model = LIBCOLOUR_CIEXYY, .x = 0.31310, .y = 0.33727, .Y = 1}
-#define LIBCOLOUR_ILLUMINANT_F2   (libcolour_ciexyy_t){.model = LIBCOLOUR_CIEXYY, .x = 0.37208, .y = 0.37529, .Y = 1}
-#define LIBCOLOUR_ILLUMINANT_F3   (libcolour_ciexyy_t){.model = LIBCOLOUR_CIEXYY, .x = 0.40910, .y = 0.39430, .Y = 1}
-#define LIBCOLOUR_ILLUMINANT_F4   (libcolour_ciexyy_t){.model = LIBCOLOUR_CIEXYY, .x = 0.44018, .y = 0.40329, .Y = 1}
-#define LIBCOLOUR_ILLUMINANT_F5   (libcolour_ciexyy_t){.model = LIBCOLOUR_CIEXYY, .x = 0.31379, .y = 0.34531, .Y = 1}
-#define LIBCOLOUR_ILLUMINANT_F6   (libcolour_ciexyy_t){.model = LIBCOLOUR_CIEXYY, .x = 0.37790, .y = 0.38835, .Y = 1}
-#define LIBCOLOUR_ILLUMINANT_F7   (libcolour_ciexyy_t){.model = LIBCOLOUR_CIEXYY, .x = 0.31292, .y = 0.32933, .Y = 1}
-#define LIBCOLOUR_ILLUMINANT_F8   (libcolour_ciexyy_t){.model = LIBCOLOUR_CIEXYY, .x = 0.34588, .y = 0.35875, .Y = 1}
-#define LIBCOLOUR_ILLUMINANT_F9   (libcolour_ciexyy_t){.model = LIBCOLOUR_CIEXYY, .x = 0.37417, .y = 0.37281, .Y = 1}
-#define LIBCOLOUR_ILLUMINANT_F10  (libcolour_ciexyy_t){.model = LIBCOLOUR_CIEXYY, .x = 0.34609, .y = 0.35986, .Y = 1}
-#define LIBCOLOUR_ILLUMINANT_F11  (libcolour_ciexyy_t){.model = LIBCOLOUR_CIEXYY, .x = 0.38052, .y = 0.37713, .Y = 1}
-#define LIBCOLOUR_ILLUMINANT_F12  (libcolour_ciexyy_t){.model = LIBCOLOUR_CIEXYY, .x = 0.43695, .y = 0.40441, .Y = 1}
-
-#define LIBCOLOUR_ILLUMINANT_A_10DEG_OBS    (libcolour_ciexyy_t){.model = LIBCOLOUR_CIEXYY, .x = 0.45117, .y = 0.40594, .Y = 1}
-#define LIBCOLOUR_ILLUMINANT_B_10DEG_OBS    (libcolour_ciexyy_t){.model = LIBCOLOUR_CIEXYY, .x = 0.34980, .y = 0.35270, .Y = 1}
-#define LIBCOLOUR_ILLUMINANT_C_10DEG_OBS    (libcolour_ciexyy_t){.model = LIBCOLOUR_CIEXYY, .x = 0.31039, .y = 0.31905, .Y = 1}
-#define LIBCOLOUR_ILLUMINANT_D50_10DEG_OBS  (libcolour_ciexyy_t){.model = LIBCOLOUR_CIEXYY, .x = 0.34773, .y = 0.35952, .Y = 1}
-#define LIBCOLOUR_ILLUMINANT_D55_10DEG_OBS  (libcolour_ciexyy_t){.model = LIBCOLOUR_CIEXYY, .x = 0.33411, .y = 0.34877, .Y = 1}
-#define LIBCOLOUR_ILLUMINANT_D65_10DEG_OBS  (libcolour_ciexyy_t){.model = LIBCOLOUR_CIEXYY, .x = 0.31382, .y = 0.33100, .Y = 1}
-#define LIBCOLOUR_ILLUMINANT_D75_10DEG_OBS  (libcolour_ciexyy_t){.model = LIBCOLOUR_CIEXYY, .x = 0.29968, .y = 0.31740, .Y = 1}
-#define LIBCOLOUR_ILLUMINANT_E_10DEG_OBS    (libcolour_ciexyy_t){.model = LIBCOLOUR_CIEXYY, .x = 1. / 3,  .y = 1. / 3,  .Y = 1}
-#define LIBCOLOUR_ILLUMINANT_F1_10DEG_OBS   (libcolour_ciexyy_t){.model = LIBCOLOUR_CIEXYY, .x = 0.31811, .y = 0.33559, .Y = 1}
-#define LIBCOLOUR_ILLUMINANT_F2_10DEG_OBS   (libcolour_ciexyy_t){.model = LIBCOLOUR_CIEXYY, .x = 0.37925, .y = 0.36733, .Y = 1}
-#define LIBCOLOUR_ILLUMINANT_F3_10DEG_OBS   (libcolour_ciexyy_t){.model = LIBCOLOUR_CIEXYY, .x = 0.41761, .y = 0.38324, .Y = 1}
-#define LIBCOLOUR_ILLUMINANT_F4_10DEG_OBS   (libcolour_ciexyy_t){.model = LIBCOLOUR_CIEXYY, .x = 0.44920, .y = 0.39074, .Y = 1}
-#define LIBCOLOUR_ILLUMINANT_F5_10DEG_OBS   (libcolour_ciexyy_t){.model = LIBCOLOUR_CIEXYY, .x = 0.31975, .y = 0.34246, .Y = 1}
-#define LIBCOLOUR_ILLUMINANT_F6_10DEG_OBS   (libcolour_ciexyy_t){.model = LIBCOLOUR_CIEXYY, .x = 0.38660, .y = 0.37847, .Y = 1}
-#define LIBCOLOUR_ILLUMINANT_F7_10DEG_OBS   (libcolour_ciexyy_t){.model = LIBCOLOUR_CIEXYY, .x = 0.31569, .y = 0.32960, .Y = 1}
-#define LIBCOLOUR_ILLUMINANT_F8_10DEG_OBS   (libcolour_ciexyy_t){.model = LIBCOLOUR_CIEXYY, .x = 0.34902, .y = 0.35939, .Y = 1}
-#define LIBCOLOUR_ILLUMINANT_F9_10DEG_OBS   (libcolour_ciexyy_t){.model = LIBCOLOUR_CIEXYY, .x = 0.37829, .y = 0.37045, .Y = 1}
-#define LIBCOLOUR_ILLUMINANT_F10_10DEG_OBS  (libcolour_ciexyy_t){.model = LIBCOLOUR_CIEXYY, .x = 0.35090, .y = 0.35444, .Y = 1}
-#define LIBCOLOUR_ILLUMINANT_F11_10DEG_OBS  (libcolour_ciexyy_t){.model = LIBCOLOUR_CIEXYY, .x = 0.38541, .y = 0.37123, .Y = 1}
-#define LIBCOLOUR_ILLUMINANT_F12_10DEG_OBS  (libcolour_ciexyy_t){.model = LIBCOLOUR_CIEXYY, .x = 0.44256, .y = 0.39717, .Y = 1}
+#define LIBCOLOUR_ILLUMINANT__(x__, y__)  (libcolour_ciexyy_t){.model = LIBCOLOUR_CIEXYY, .x = x__, .y = y__, .Y = 1}
+
+#define LIBCOLOUR_ILLUMINANT_A    LIBCOLOUR_ILLUMINANT__(0.447573514098910552050369915378, 0.407439444306660847328060981454)
+#define LIBCOLOUR_ILLUMINANT_B    LIBCOLOUR_ILLUMINANT__(0.348407693041403399014654951316, 0.351617234807268863594487129376)
+#define LIBCOLOUR_ILLUMINANT_C    LIBCOLOUR_ILLUMINANT__(0.310058473730255412803558101587, 0.316149707523236456196968902077)
+#define LIBCOLOUR_ILLUMINANT_D50  LIBCOLOUR_ILLUMINANT__(0.345668037029273123028616510055, 0.358496838937619077825047497754)
+#define LIBCOLOUR_ILLUMINANT_D55  LIBCOLOUR_ILLUMINANT__(0.332424102468830251488896010414, 0.347428039087666229445261478759)
+#define LIBCOLOUR_ILLUMINANT_D65  LIBCOLOUR_ILLUMINANT__(0.312726871026564878786047074755, 0.329023206641284038376227272238)
+#define LIBCOLOUR_ILLUMINANT_D75  LIBCOLOUR_ILLUMINANT__(0.299022300412497055166483050925, 0.314852737888341893679466920730)
+#define LIBCOLOUR_ILLUMINANT_E    LIBCOLOUR_ILLUMINANT__(1. / 3, 1. / 3)
+#define LIBCOLOUR_ILLUMINANT_F1   LIBCOLOUR_ILLUMINANT__(0.313062433035651010992950205036, 0.337106477918307445573731229160)
+#define LIBCOLOUR_ILLUMINANT_F2   LIBCOLOUR_ILLUMINANT__(0.372068154452825539113547392844, 0.375122558203110079144693145281)
+#define LIBCOLOUR_ILLUMINANT_F3   LIBCOLOUR_ILLUMINANT__(0.409090035308107391465171076561, 0.394117134255365986206243178458)
+#define LIBCOLOUR_ILLUMINANT_F4   LIBCOLOUR_ILLUMINANT__(0.440181095827666568620628595454, 0.403090691158138336724903183494)
+#define LIBCOLOUR_ILLUMINANT_F5   LIBCOLOUR_ILLUMINANT__(0.313756583095696484075887155996, 0.345160794752101929283583103825)
+#define LIBCOLOUR_ILLUMINANT_F6   LIBCOLOUR_ILLUMINANT__(0.377882361062687466279896852939, 0.388192885537868959122675960316)
+#define LIBCOLOUR_ILLUMINANT_F7   LIBCOLOUR_ILLUMINANT__(0.312852472915475354753311876266, 0.329174178033567632617462095368)
+#define LIBCOLOUR_ILLUMINANT_F8   LIBCOLOUR_ILLUMINANT__(0.345805753550315952971061506105, 0.358617583214377477762724311106)
+#define LIBCOLOUR_ILLUMINANT_F9   LIBCOLOUR_ILLUMINANT__(0.374105245592801061160770359493, 0.372672400924498159469067104510)
+#define LIBCOLOUR_ILLUMINANT_F10  LIBCOLOUR_ILLUMINANT__(0.346086913993929323751785886998, 0.358751605952200347537939251197)
+#define LIBCOLOUR_ILLUMINANT_F11  LIBCOLOUR_ILLUMINANT__(0.380537485483030235577928124258, 0.376915309293930078649026427229)
+#define LIBCOLOUR_ILLUMINANT_F12  LIBCOLOUR_ILLUMINANT__(0.437023901312296902954557253906, 0.404214327891585678553809657387)
+
+#define LIBCOLOUR_ILLUMINANT_A_10DEG_OBS    LIBCOLOUR_ILLUMINANT__(0.451173939693730152722395132514, 0.405936604212625562482230634487)
+#define LIBCOLOUR_ILLUMINANT_B_10DEG_OBS    LIBCOLOUR_ILLUMINANT__(0.349819801494100579564161535018, 0.352687989927865819250740742063)
+#define LIBCOLOUR_ILLUMINANT_C_10DEG_OBS    LIBCOLOUR_ILLUMINANT__(0.310388663270034004248998371622, 0.319050711366790695766582075521)
+#define LIBCOLOUR_ILLUMINANT_D50_10DEG_OBS  LIBCOLOUR_ILLUMINANT__(0.347729429961154856698613002663, 0.359522508516545380441442603114)
+#define LIBCOLOUR_ILLUMINANT_D55_10DEG_OBS  LIBCOLOUR_ILLUMINANT__(0.334116336430253457745465084372, 0.348766090975953568786849245953)
+#define LIBCOLOUR_ILLUMINANT_D65_10DEG_OBS  LIBCOLOUR_ILLUMINANT__(0.313823646938709621689866935412, 0.330998985489933561510156323493)
+#define LIBCOLOUR_ILLUMINANT_D75_10DEG_OBS  LIBCOLOUR_ILLUMINANT__(0.299679971345752860223399238748, 0.317403239854836705102769656150)
+#define LIBCOLOUR_ILLUMINANT_E_10DEG_OBS    LIBCOLOUR_ILLUMINANT__(1. / 3, 1. / 3)
+#define LIBCOLOUR_ILLUMINANT_F1_10DEG_OBS   LIBCOLOUR_ILLUMINANT__(0.318098801070991199502202562144, 0.335489451474129951602520804954)
+#define LIBCOLOUR_ILLUMINANT_F2_10DEG_OBS   LIBCOLOUR_ILLUMINANT__(0.379274832262508854174853922814, 0.367227934400669309145115448700)
+#define LIBCOLOUR_ILLUMINANT_F3_10DEG_OBS   LIBCOLOUR_ILLUMINANT__(0.417644682102624287267644831445, 0.383124504918675723441623404142)
+#define LIBCOLOUR_ILLUMINANT_F4_10DEG_OBS   LIBCOLOUR_ILLUMINANT__(0.449247699162001246087072559021, 0.390605475879083674506375700730)
+#define LIBCOLOUR_ILLUMINANT_F5_10DEG_OBS   LIBCOLOUR_ILLUMINANT__(0.319739939104951298443069163113, 0.342367055369128092667807550242)
+#define LIBCOLOUR_ILLUMINANT_F6_10DEG_OBS   LIBCOLOUR_ILLUMINANT__(0.386626908526034762658696308790, 0.378372201588893453116924092683)
+#define LIBCOLOUR_ILLUMINANT_F7_10DEG_OBS   LIBCOLOUR_ILLUMINANT__(0.315645637312390425766039925293, 0.329508145132134222521358424274)
+#define LIBCOLOUR_ILLUMINANT_F8_10DEG_OBS   LIBCOLOUR_ILLUMINANT__(0.348965563721531868424108324689, 0.359317299140994528272585739614)
+#define LIBCOLOUR_ILLUMINANT_F9_10DEG_OBS   LIBCOLOUR_ILLUMINANT__(0.378258900384649654480284652891, 0.370371375730762564248976786985)
+#define LIBCOLOUR_ILLUMINANT_F10_10DEG_OBS  LIBCOLOUR_ILLUMINANT__(0.350893389986753234666139178444, 0.354302210111646531665030579461)
+#define LIBCOLOUR_ILLUMINANT_F11_10DEG_OBS  LIBCOLOUR_ILLUMINANT__(0.385435391037903751776383387551, 0.371094786781121399599214782938)
+#define LIBCOLOUR_ILLUMINANT_F12_10DEG_OBS  LIBCOLOUR_ILLUMINANT__(0.442654456042513022584472537346, 0.397060737666593277506166259627)
 
 
 #define LIBCOLOUR_LIST_MODELS\