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/cxfa_ffwidget.cpp | |
| 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/cxfa_ffwidget.cpp')
| -rw-r--r-- | xfa/fxfa/cxfa_ffwidget.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/xfa/fxfa/cxfa_ffwidget.cpp b/xfa/fxfa/cxfa_ffwidget.cpp index bdadba7c85..06de436e09 100644 --- a/xfa/fxfa/cxfa_ffwidget.cpp +++ b/xfa/fxfa/cxfa_ffwidget.cpp @@ -1660,12 +1660,11 @@ static void XFA_BOX_Fill(CXFA_Box box, FX_ARGB cr; if (eType == XFA_Element::Stipple) { int32_t iRate = fill.GetStipple(cr); - if (iRate == 0) { + if (iRate == 0) iRate = 100; - } - int32_t a = 0; + int32_t a; FX_COLORREF rgb; - ArgbDecode(cr, a, rgb); + std::tie(a, rgb) = ArgbToColorRef(cr); cr = ArgbEncode(iRate * a / 100, rgb); } else { cr = fill.GetColor(); |