diff options
| author | Tavian Barnes <tavianator@gmail.com> | 2009-04-10 15:59:43 +0000 |
|---|---|---|
| committer | Tavian Barnes <tavianator@gmail.com> | 2009-04-10 15:59:43 +0000 |
| commit | 725565212bd45e557b7ba2f313f956428b287c14 (patch) | |
| tree | 7ec79c2fcdcf671e09f90f12e7aee15458bac873 /libdimension | |
| parent | 736112151a925384aaac679e8fbaa11aa3ccff1f (diff) | |
| download | dimension-725565212bd45e557b7ba2f313f956428b287c14.tar.xz | |
Rename whitepoint to dmnsn_whitepoint.
Diffstat (limited to 'libdimension')
| -rw-r--r-- | libdimension/color.c | 12 | ||||
| -rw-r--r-- | libdimension/dimension/color.h | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/libdimension/color.c b/libdimension/color.c index cea2675..6c14ce6 100644 --- a/libdimension/color.c +++ b/libdimension/color.c @@ -22,9 +22,9 @@ #include <math.h> /* For pow() */ /* sRGB white point (D50) */ -dmnsn_CIE_XYZ whitepoint = { .X = 0.9504060171449392, - .Y = 0.9999085943425312, - .Z = 1.089062231497274 }; +dmnsn_CIE_XYZ dmnsn_whitepoint = { .X = 0.9504060171449392, + .Y = 0.9999085943425312, + .Z = 1.089062231497274 }; dmnsn_color dmnsn_color_from_XYZ(dmnsn_CIE_XYZ XYZ) @@ -236,14 +236,14 @@ dmnsn_color_add(dmnsn_color color1, dmnsn_color color2) dmnsn_CIE_Lab Lab, Lab1, Lab2; dmnsn_color ret; - Lab1 = dmnsn_Lab_from_color(color1, whitepoint); - Lab2 = dmnsn_Lab_from_color(color2, whitepoint); + Lab1 = dmnsn_Lab_from_color(color1, dmnsn_whitepoint); + Lab2 = dmnsn_Lab_from_color(color2, dmnsn_whitepoint); Lab.L = Lab1.L + Lab2.L; Lab.a = Lab1.a + Lab2.a; Lab.b = Lab1.b + Lab2.b; - ret = dmnsn_color_from_Lab(Lab, whitepoint); + ret = dmnsn_color_from_Lab(Lab, dmnsn_whitepoint); ret.filter = (Lab1.L*color1.filter + Lab2.L*color2.filter)/Lab.L; ret.trans = (Lab1.L*color1.trans + Lab2.L*color2.trans)/Lab.L; diff --git a/libdimension/dimension/color.h b/libdimension/dimension/color.h index 0dade0f..5d00b7b 100644 --- a/libdimension/dimension/color.h +++ b/libdimension/dimension/color.h @@ -65,7 +65,7 @@ typedef struct { } dmnsn_sRGB; /* Standard whitepoint, determined by the conversion of sRGB white to XYZ */ -extern dmnsn_CIE_XYZ whitepoint; +extern dmnsn_CIE_XYZ dmnsn_whitepoint; dmnsn_color dmnsn_color_from_XYZ(dmnsn_CIE_XYZ XYZ); dmnsn_color dmnsn_color_from_xyY(dmnsn_CIE_xyY xyY); |