diff options
| author | Mattias Andrée <maandree@kth.se> | 2017-06-06 16:47:30 +0200 |
|---|---|---|
| committer | Mattias Andrée <maandree@kth.se> | 2017-06-06 16:47:30 +0200 |
| commit | 0577312c8768ac540eb0703108cd5fbb40a95342 (patch) | |
| tree | 10c780c944cfd6ac2fd1b1ad99908bd6217fb579 | |
| parent | Update todo (diff) | |
| download | libcolour-0577312c8768ac540eb0703108cd5fbb40a95342.tar.gz libcolour-0577312c8768ac540eb0703108cd5fbb40a95342.tar.bz2 libcolour-0577312c8768ac540eb0703108cd5fbb40a95342.tar.xz | |
m
Signed-off-by: Mattias Andrée <maandree@kth.se>
| -rw-r--r-- | libcolour.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libcolour.h b/libcolour.h index 0ea98a7..4379709 100644 --- a/libcolour.h +++ b/libcolour.h @@ -17,7 +17,7 @@ #define LIBCOLOUR_ILL__(S, T, X_, Y_) (S){.model = LIBCOLOUR_CIEXYY, .x = (T)(X_), .y = (T)(Y_), .Y = 1} #define LIBCOLOUR_F__(X_, Y_) LIBCOLOUR_ILL__(libcolour_ciexyy_f_t, float, (X_), (Y_)) #define LIBCOLOUR_LF__(X_, Y_) LIBCOLOUR_ILL__(libcolour_ciexyy_lf_t, double, (X_), (Y_)) -#define LIBCOLOUR_LLF__(X_, Y_) LIBCOLOUR_ILL__(libcolour_ciexyy_llf_t, long double, (X_), (Y_)) +#define LIBCOLOUR_LLF__(X_, Y_) LIBCOLOUR_ILL__(libcolour_ciexyy_llf_t, long double, (X_##L), (Y_##L)) /* 2-degrees observer standard illuminants */ #define LIBCOLOUR_ILLUMINANT_A_F LIBCOLOUR_F__(0.447573514098910552050369915378, 0.407439444306660847328060981454) @@ -27,7 +27,7 @@ #define LIBCOLOUR_ILLUMINANT_D55_F LIBCOLOUR_F__(0.332424102468830251488896010414, 0.347428039087666229445261478759) #define LIBCOLOUR_ILLUMINANT_D65_F LIBCOLOUR_F__(0.312726871026564878786047074755, 0.329023206641284038376227272238) #define LIBCOLOUR_ILLUMINANT_D75_F LIBCOLOUR_F__(0.299022300412497055166483050925, 0.314852737888341893679466920730) -#define LIBCOLOUR_ILLUMINANT_E_F LIBCOLOUR_F__(1. / 3, 1. / 3) +#define LIBCOLOUR_ILLUMINANT_E_F LIBCOLOUR_F__(1. / 3., 1. / 3.) #define LIBCOLOUR_ILLUMINANT_F1_F LIBCOLOUR_F__(0.313062433035651010992950205036, 0.337106477918307445573731229160) #define LIBCOLOUR_ILLUMINANT_F2_F LIBCOLOUR_F__(0.372068154452825539113547392844, 0.375122558203110079144693145281) #define LIBCOLOUR_ILLUMINANT_F3_F LIBCOLOUR_F__(0.409090035308107391465171076561, 0.394117134255365986206243178458) @@ -48,7 +48,7 @@ #define LIBCOLOUR_ILLUMINANT_D55_LF LIBCOLOUR_LF__(0.332424102468830251488896010414, 0.347428039087666229445261478759) #define LIBCOLOUR_ILLUMINANT_D65_LF LIBCOLOUR_LF__(0.312726871026564878786047074755, 0.329023206641284038376227272238) #define LIBCOLOUR_ILLUMINANT_D75_LF LIBCOLOUR_LF__(0.299022300412497055166483050925, 0.314852737888341893679466920730) -#define LIBCOLOUR_ILLUMINANT_E_LF LIBCOLOUR_LF__(1. / 3, 1. / 3) +#define LIBCOLOUR_ILLUMINANT_E_LF LIBCOLOUR_LF__(1. / 3., 1. / 3.) #define LIBCOLOUR_ILLUMINANT_F1_LF LIBCOLOUR_LF__(0.313062433035651010992950205036, 0.337106477918307445573731229160) #define LIBCOLOUR_ILLUMINANT_F2_LF LIBCOLOUR_LF__(0.372068154452825539113547392844, 0.375122558203110079144693145281) #define LIBCOLOUR_ILLUMINANT_F3_LF LIBCOLOUR_LF__(0.409090035308107391465171076561, 0.394117134255365986206243178458) @@ -69,7 +69,7 @@ #define LIBCOLOUR_ILLUMINANT_D55_LLF LIBCOLOUR_LLF__(0.332424102468830251488896010414, 0.347428039087666229445261478759) #define LIBCOLOUR_ILLUMINANT_D65_LLF LIBCOLOUR_LLF__(0.312726871026564878786047074755, 0.329023206641284038376227272238) #define LIBCOLOUR_ILLUMINANT_D75_LLF LIBCOLOUR_LLF__(0.299022300412497055166483050925, 0.314852737888341893679466920730) -#define LIBCOLOUR_ILLUMINANT_E_LLF LIBCOLOUR_LLF__(1. / 3, 1. / 3) +#define LIBCOLOUR_ILLUMINANT_E_LLF LIBCOLOUR_LLF__(1. / 3., 1. / 3.) #define LIBCOLOUR_ILLUMINANT_F1_LLF LIBCOLOUR_LLF__(0.313062433035651010992950205036, 0.337106477918307445573731229160) #define LIBCOLOUR_ILLUMINANT_F2_LLF LIBCOLOUR_LLF__(0.372068154452825539113547392844, 0.375122558203110079144693145281) #define LIBCOLOUR_ILLUMINANT_F3_LLF LIBCOLOUR_LLF__(0.409090035308107391465171076561, 0.394117134255365986206243178458) @@ -91,7 +91,7 @@ #define LIBCOLOUR_ILLUMINANT_D55_10DEG_OBS_F LIBCOLOUR_F__(0.334116336430253457745465084372, 0.348766090975953568786849245953) #define LIBCOLOUR_ILLUMINANT_D65_10DEG_OBS_F LIBCOLOUR_F__(0.313823646938709621689866935412, 0.330998985489933561510156323493) #define LIBCOLOUR_ILLUMINANT_D75_10DEG_OBS_F LIBCOLOUR_F__(0.299679971345752860223399238748, 0.317403239854836705102769656150) -#define LIBCOLOUR_ILLUMINANT_E_10DEG_OBS_F LIBCOLOUR_F__(1. / 3, 1. / 3) +#define LIBCOLOUR_ILLUMINANT_E_10DEG_OBS_F LIBCOLOUR_F__(1. / 3., 1. / 3.) #define LIBCOLOUR_ILLUMINANT_F1_10DEG_OBS_F LIBCOLOUR_F__(0.318098801070991199502202562144, 0.335489451474129951602520804954) #define LIBCOLOUR_ILLUMINANT_F2_10DEG_OBS_F LIBCOLOUR_F__(0.379274832262508854174853922814, 0.367227934400669309145115448700) #define LIBCOLOUR_ILLUMINANT_F3_10DEG_OBS_F LIBCOLOUR_F__(0.417644682102624287267644831445, 0.383124504918675723441623404142) @@ -112,7 +112,7 @@ #define LIBCOLOUR_ILLUMINANT_D55_10DEG_OBS_LF LIBCOLOUR_LF__(0.334116336430253457745465084372, 0.348766090975953568786849245953) #define LIBCOLOUR_ILLUMINANT_D65_10DEG_OBS_LF LIBCOLOUR_LF__(0.313823646938709621689866935412, 0.330998985489933561510156323493) #define LIBCOLOUR_ILLUMINANT_D75_10DEG_OBS_LF LIBCOLOUR_LF__(0.299679971345752860223399238748, 0.317403239854836705102769656150) -#define LIBCOLOUR_ILLUMINANT_E_10DEG_OBS_LF LIBCOLOUR_LF__(1. / 3, 1. / 3) +#define LIBCOLOUR_ILLUMINANT_E_10DEG_OBS_LF LIBCOLOUR_LF__(1. / 3., 1. / 3.) #define LIBCOLOUR_ILLUMINANT_F1_10DEG_OBS_LF LIBCOLOUR_LF__(0.318098801070991199502202562144, 0.335489451474129951602520804954) #define LIBCOLOUR_ILLUMINANT_F2_10DEG_OBS_LF LIBCOLOUR_LF__(0.379274832262508854174853922814, 0.367227934400669309145115448700) #define LIBCOLOUR_ILLUMINANT_F3_10DEG_OBS_LF LIBCOLOUR_LF__(0.417644682102624287267644831445, 0.383124504918675723441623404142) @@ -133,7 +133,7 @@ #define LIBCOLOUR_ILLUMINANT_D55_10DEG_OBS_LLF LIBCOLOUR_LLF__(0.334116336430253457745465084372, 0.348766090975953568786849245953) #define LIBCOLOUR_ILLUMINANT_D65_10DEG_OBS_LLF LIBCOLOUR_LLF__(0.313823646938709621689866935412, 0.330998985489933561510156323493) #define LIBCOLOUR_ILLUMINANT_D75_10DEG_OBS_LLF LIBCOLOUR_LLF__(0.299679971345752860223399238748, 0.317403239854836705102769656150) -#define LIBCOLOUR_ILLUMINANT_E_10DEG_OBS_LLF LIBCOLOUR_LLF__(1. / 3, 1. / 3) +#define LIBCOLOUR_ILLUMINANT_E_10DEG_OBS_LLF LIBCOLOUR_LLF__(1. / 3., 1. / 3.) #define LIBCOLOUR_ILLUMINANT_F1_10DEG_OBS_LLF LIBCOLOUR_LLF__(0.318098801070991199502202562144, 0.335489451474129951602520804954) #define LIBCOLOUR_ILLUMINANT_F2_10DEG_OBS_LLF LIBCOLOUR_LLF__(0.379274832262508854174853922814, 0.367227934400669309145115448700) #define LIBCOLOUR_ILLUMINANT_F3_10DEG_OBS_LLF LIBCOLOUR_LLF__(0.417644682102624287267644831445, 0.383124504918675723441623404142) |