manolas
/
vcglib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

renamed ILLUMINANT_* with VCG_ILLUMINANT_* in order to avoid conflicts with the visual studio defines.

This commit is contained in:
granzuglia 2011-11-18 10:42:19 +00:00
parent c9fbf25362
commit 59b789818e
1 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
vcg/space/colorspace.h
View File

@ -120,15 +120,15 @@ public:
enum Illuminant enum Illuminant
{ {
ILLUMINANT_A = 0, VCG_ILLUMINANT_A = 0,
ILLUMINANT_B = 1, VCG_ILLUMINANT_B = 1,
ILLUMINANT_C = 2, VCG_ILLUMINANT_C = 2,
ILLUMINANT_D50 = 3, VCG_ILLUMINANT_D50 = 3,
ILLUMINANT_D55 = 4, VCG_ILLUMINANT_D55 = 4,
ILLUMINANT_D65 = 5, VCG_ILLUMINANT_D65 = 5,
ILLUMINANT_D75 = 6, VCG_ILLUMINANT_D75 = 6,
ILLUMINANT_E = 7, VCG_ILLUMINANT_E = 7,
ILLUMINANT_INVALID = 8 VCG_ILLUMINANT_INVALID = 8
}; };
enum RGBSpaces enum RGBSpaces
@ -1388,68 +1388,68 @@ public:
if (rgb_space == ADOBE_RGB) if (rgb_space == ADOBE_RGB)
{ {
return ILLUMINANT_D65; return VCG_ILLUMINANT_D65;
} }
else if (rgb_space == APPLE_RGB) else if (rgb_space == APPLE_RGB)
{ {
return ILLUMINANT_D65; return VCG_ILLUMINANT_D65;
} }
else if (rgb_space == BEST_RGB) else if (rgb_space == BEST_RGB)
{ {
return ILLUMINANT_D50; return VCG_ILLUMINANT_D50;
} }
else if (rgb_space == BETA_RGB) else if (rgb_space == BETA_RGB)
{ {
return ILLUMINANT_D50; return VCG_ILLUMINANT_D50;
} }
else if (rgb_space == BRUCE_RGB) else if (rgb_space == BRUCE_RGB)
{ {
return ILLUMINANT_D65; return VCG_ILLUMINANT_D65;
} }
else if (rgb_space == CIE_RGB) else if (rgb_space == CIE_RGB)
{ {
return ILLUMINANT_E; return VCG_ILLUMINANT_E;
} }
else if (rgb_space == DON_RGB4) else if (rgb_space == DON_RGB4)
{ {
return ILLUMINANT_D50; return VCG_ILLUMINANT_D50;
} }
else if (rgb_space == ECI_RGB) else if (rgb_space == ECI_RGB)
{ {
return ILLUMINANT_D50; return VCG_ILLUMINANT_D50;
} }
else if (rgb_space == EKTA_SPACE) else if (rgb_space == EKTA_SPACE)
{ {
return ILLUMINANT_D50; return VCG_ILLUMINANT_D50;
} }
else if (rgb_space == NTSC_RGB) else if (rgb_space == NTSC_RGB)
{ {
return ILLUMINANT_C; return VCG_ILLUMINANT_C;
} }
else if (rgb_space == PAL_RGB) else if (rgb_space == PAL_RGB)
{ {
return ILLUMINANT_D65; return VCG_ILLUMINANT_D65;
} }
else if (rgb_space == PROPHOTO) else if (rgb_space == PROPHOTO)
{ {
return ILLUMINANT_D50; return VCG_ILLUMINANT_D50;
} }
else if (rgb_space == SMPTE_C) else if (rgb_space == SMPTE_C)
{ {
return ILLUMINANT_D65; return VCG_ILLUMINANT_D65;
} }
else if (rgb_space == SRGB) else if (rgb_space == SRGB)
{ {
return ILLUMINANT_D65; return VCG_ILLUMINANT_D65;
} }
else if (rgb_space == WIDE_GAMUT) else if (rgb_space == WIDE_GAMUT)
{ {
return ILLUMINANT_D50; return VCG_ILLUMINANT_D50;
} }
else else
{ {
assert(false); assert(false);
return ILLUMINANT_INVALID; return VCG_ILLUMINANT_INVALID;
} }
} }