diff options
| author | Nicolas Pena <npm@chromium.org> | 2017-04-20 15:29:25 -0400 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-04-20 20:12:17 +0000 |
| commit | ddfc3dcce42ad1dc805f29102f7d056a5809d489 (patch) | |
| tree | 686e0f28269a8d1e3c9eb2e9806f76ee2cb4b9f5 /xfa/fxfa/parser | |
| parent | 58532b670716d5fe3ab024475fa1aa1580ecfe5b (diff) | |
| download | pdfium-ddfc3dcce42ad1dc805f29102f7d056a5809d489.tar.xz | |
Let {Argb,Cmyk}Decode return tuples
Change-Id: Ic4e766d9417f9a9ece5f9e4269d0f96e1e91639b
Reviewed-on: https://pdfium-review.googlesource.com/4392
Commit-Queue: Nicolás Peña <npm@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'xfa/fxfa/parser')
| -rw-r--r-- | xfa/fxfa/parser/cxfa_fill.cpp | 7 | ||||
| -rw-r--r-- | xfa/fxfa/parser/cxfa_node.cpp | 11 | ||||
| -rw-r--r-- | xfa/fxfa/parser/cxfa_stroke.cpp | 2 |
3 files changed, 13 insertions, 7 deletions
diff --git a/xfa/fxfa/parser/cxfa_fill.cpp b/xfa/fxfa/parser/cxfa_fill.cpp index 8621c3c961..8a7969d5e4 100644 --- a/xfa/fxfa/parser/cxfa_fill.cpp +++ b/xfa/fxfa/parser/cxfa_fill.cpp @@ -19,8 +19,11 @@ int32_t CXFA_Fill::GetPresence() { void CXFA_Fill::SetColor(FX_ARGB color) { CXFA_Node* pNode = m_pNode->GetProperty(0, XFA_Element::Color); CFX_WideString wsColor; - int a, r, g, b; - ArgbDecode(color, a, r, g, b); + int a; + int r; + int g; + int b; + std::tie(a, r, g, b) = ArgbDecode(color); wsColor.Format(L"%d,%d,%d", r, g, b); pNode->SetCData(XFA_ATTRIBUTE_Value, wsColor); } diff --git a/xfa/fxfa/parser/cxfa_node.cpp b/xfa/fxfa/parser/cxfa_node.cpp index d6d2ece428..73fc88db8f 100644 --- a/xfa/fxfa/parser/cxfa_node.cpp +++ b/xfa/fxfa/parser/cxfa_node.cpp @@ -2054,8 +2054,11 @@ void CXFA_Node::Script_Som_BorderColor(CFXJSE_Value* pValue, } else { CXFA_Edge edge = border.GetEdge(0); FX_ARGB color = edge.GetColor(); - int32_t a, r, g, b; - ArgbDecode(color, a, r, g, b); + int32_t a; + int32_t r; + int32_t g; + int32_t b; + std::tie(a, r, g, b) = ArgbDecode(color); CFX_WideString strColor; strColor.Format(L"%d,%d,%d", r, g, b); pValue->SetString(strColor.UTF8Encode().AsStringC()); @@ -2113,7 +2116,7 @@ void CXFA_Node::Script_Som_FillColor(CFXJSE_Value* pValue, int32_t r; int32_t g; int32_t b; - ArgbDecode(color, a, r, g, b); + std::tie(a, r, g, b) = ArgbDecode(color); CFX_WideString wsColor; wsColor.Format(L"%d,%d,%d", r, g, b); pValue->SetString(wsColor.UTF8Encode().AsStringC()); @@ -2265,7 +2268,7 @@ void CXFA_Node::Script_Som_FontColor(CFXJSE_Value* pValue, int32_t r; int32_t g; int32_t b; - ArgbDecode(color, a, r, g, b); + std::tie(a, r, g, b) = ArgbDecode(color); CFX_WideString wsColor; wsColor.Format(L"%d,%d,%d", r, g, b); pValue->SetString(wsColor.UTF8Encode().AsStringC()); diff --git a/xfa/fxfa/parser/cxfa_stroke.cpp b/xfa/fxfa/parser/cxfa_stroke.cpp index df11cbee00..e81c0ce591 100644 --- a/xfa/fxfa/parser/cxfa_stroke.cpp +++ b/xfa/fxfa/parser/cxfa_stroke.cpp @@ -67,7 +67,7 @@ void CXFA_Stroke::SetColor(FX_ARGB argb) { int r; int g; int b; - ArgbDecode(argb, a, r, g, b); + std::tie(a, r, g, b) = ArgbDecode(argb); wsColor.Format(L"%d,%d,%d", r, g, b); pNode->SetCData(XFA_ATTRIBUTE_Value, wsColor); } |