diff options
Diffstat (limited to 'fpdfsdk/javascript/color.cpp')
| -rw-r--r-- | fpdfsdk/javascript/color.cpp | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/fpdfsdk/javascript/color.cpp b/fpdfsdk/javascript/color.cpp index 574c81a3c0..db860d37df 100644 --- a/fpdfsdk/javascript/color.cpp +++ b/fpdfsdk/javascript/color.cpp @@ -39,18 +39,18 @@ JSMethodSpec CJS_Color::MethodSpecs[] = {{"convert", convert_static}, IMPLEMENT_JS_CLASS(CJS_Color, color) color::color(CJS_Object* pJSObject) : CJS_EmbedObj(pJSObject) { - m_crTransparent = CFX_Color(COLORTYPE_TRANSPARENT); - m_crBlack = CFX_Color(COLORTYPE_GRAY, 0); - m_crWhite = CFX_Color(COLORTYPE_GRAY, 1); - m_crRed = CFX_Color(COLORTYPE_RGB, 1, 0, 0); - m_crGreen = CFX_Color(COLORTYPE_RGB, 0, 1, 0); - m_crBlue = CFX_Color(COLORTYPE_RGB, 0, 0, 1); - m_crCyan = CFX_Color(COLORTYPE_CMYK, 1, 0, 0, 0); - m_crMagenta = CFX_Color(COLORTYPE_CMYK, 0, 1, 0, 0); - m_crYellow = CFX_Color(COLORTYPE_CMYK, 0, 0, 1, 0); - m_crDKGray = CFX_Color(COLORTYPE_GRAY, 0.25); - m_crGray = CFX_Color(COLORTYPE_GRAY, 0.5); - m_crLTGray = CFX_Color(COLORTYPE_GRAY, 0.75); + m_crTransparent = CFX_Color(CFX_Color::kTransparent); + m_crBlack = CFX_Color(CFX_Color::kGray, 0); + m_crWhite = CFX_Color(CFX_Color::kGray, 1); + m_crRed = CFX_Color(CFX_Color::kRGB, 1, 0, 0); + m_crGreen = CFX_Color(CFX_Color::kRGB, 0, 1, 0); + m_crBlue = CFX_Color(CFX_Color::kRGB, 0, 0, 1); + m_crCyan = CFX_Color(CFX_Color::kCMYK, 1, 0, 0, 0); + m_crMagenta = CFX_Color(CFX_Color::kCMYK, 0, 1, 0, 0); + m_crYellow = CFX_Color(CFX_Color::kCMYK, 0, 0, 1, 0); + m_crDKGray = CFX_Color(CFX_Color::kGray, 0.25); + m_crGray = CFX_Color(CFX_Color::kGray, 0.5); + m_crLTGray = CFX_Color(CFX_Color::kGray, 0.75); } color::~color() {} @@ -59,20 +59,20 @@ void color::ConvertPWLColorToArray(CJS_Runtime* pRuntime, const CFX_Color& color, CJS_Array* array) { switch (color.nColorType) { - case COLORTYPE_TRANSPARENT: + case CFX_Color::kTransparent: array->SetElement(pRuntime, 0, CJS_Value(pRuntime, "T")); break; - case COLORTYPE_GRAY: + case CFX_Color::kGray: array->SetElement(pRuntime, 0, CJS_Value(pRuntime, "G")); array->SetElement(pRuntime, 1, CJS_Value(pRuntime, color.fColor1)); break; - case COLORTYPE_RGB: + case CFX_Color::kRGB: array->SetElement(pRuntime, 0, CJS_Value(pRuntime, "RGB")); array->SetElement(pRuntime, 1, CJS_Value(pRuntime, color.fColor1)); array->SetElement(pRuntime, 2, CJS_Value(pRuntime, color.fColor2)); array->SetElement(pRuntime, 3, CJS_Value(pRuntime, color.fColor3)); break; - case COLORTYPE_CMYK: + case CFX_Color::kCMYK: array->SetElement(pRuntime, 0, CJS_Value(pRuntime, "CMYK")); array->SetElement(pRuntime, 1, CJS_Value(pRuntime, color.fColor1)); array->SetElement(pRuntime, 2, CJS_Value(pRuntime, color.fColor2)); @@ -119,14 +119,14 @@ void color::ConvertArrayToPWLColor(CJS_Runtime* pRuntime, } if (sSpace == "T") { - *color = CFX_Color(COLORTYPE_TRANSPARENT); + *color = CFX_Color(CFX_Color::kTransparent); } else if (sSpace == "G") { - *color = CFX_Color(COLORTYPE_GRAY, (float)d1); + *color = CFX_Color(CFX_Color::kGray, (float)d1); } else if (sSpace == "RGB") { - *color = CFX_Color(COLORTYPE_RGB, (float)d1, (float)d2, (float)d3); + *color = CFX_Color(CFX_Color::kRGB, (float)d1, (float)d2, (float)d3); } else if (sSpace == "CMYK") { *color = - CFX_Color(COLORTYPE_CMYK, (float)d1, (float)d2, (float)d3, (float)d4); + CFX_Color(CFX_Color::kCMYK, (float)d1, (float)d2, (float)d3, (float)d4); } } @@ -226,16 +226,16 @@ bool color::convert(CJS_Runtime* pRuntime, ConvertArrayToPWLColor(pRuntime, aSource, &crSource); ByteString sDestSpace = params[1].ToCFXByteString(pRuntime); - int nColorType = COLORTYPE_TRANSPARENT; + int nColorType = CFX_Color::kTransparent; if (sDestSpace == "T") { - nColorType = COLORTYPE_TRANSPARENT; + nColorType = CFX_Color::kTransparent; } else if (sDestSpace == "G") { - nColorType = COLORTYPE_GRAY; + nColorType = CFX_Color::kGray; } else if (sDestSpace == "RGB") { - nColorType = COLORTYPE_RGB; + nColorType = CFX_Color::kRGB; } else if (sDestSpace == "CMYK") { - nColorType = COLORTYPE_CMYK; + nColorType = CFX_Color::kCMYK; } CJS_Array aDest; |