diff options
| author | Lei Zhang <thestig@chromium.org> | 2018-05-29 18:45:39 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-05-29 18:45:39 +0000 |
| commit | 162a31a6af1538acf7ac9835111626161287d742 (patch) | |
| tree | 7235629237d6ff187e68a116604acd83c6700b1a /core/fxge/dib/cfx_dibitmap.cpp | |
| parent | ac8357b3ec7e1fe4000ebcae5ce65a38bfeb5cb1 (diff) | |
| download | pdfium-162a31a6af1538acf7ac9835111626161287d742.tar.xz | |
Get rid of FXARGB_MAKE macro.
ArgbEncode() does the same thing.
Change-Id: Ibb05ed4aae720c0a5ba66771699c0d7e11230921
Reviewed-on: https://pdfium-review.googlesource.com/32230
Reviewed-by: dsinclair <dsinclair@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Diffstat (limited to 'core/fxge/dib/cfx_dibitmap.cpp')
| -rw-r--r-- | core/fxge/dib/cfx_dibitmap.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/fxge/dib/cfx_dibitmap.cpp b/core/fxge/dib/cfx_dibitmap.cpp index 15e821cf11..f17ca52095 100644 --- a/core/fxge/dib/cfx_dibitmap.cpp +++ b/core/fxge/dib/cfx_dibitmap.cpp @@ -738,8 +738,8 @@ void CFX_DIBitmap::ConvertBGRColorScale(uint32_t forecolor, FXARGB_G(m_pPalette.get()[i]), FXARGB_B(m_pPalette.get()[i])); m_pPalette.get()[i] = - FXARGB_MAKE(0xff, br + (fr - br) * gray / 255, - bg + (fg - bg) * gray / 255, bb + (fb - bb) * gray / 255); + ArgbEncode(0xff, br + (fr - br) * gray / 255, + bg + (fg - bg) * gray / 255, bb + (fb - bb) * gray / 255); } return; } @@ -1153,8 +1153,8 @@ bool CFX_DIBitmap::CompositeRect(int left, for (int col = 0; col < width; col++) { uint8_t back_alpha = dest_scan[3]; if (back_alpha == 0) { - FXARGB_SETDIB(dest_scan, FXARGB_MAKE(src_alpha, color_p[2], - color_p[1], color_p[0])); + FXARGB_SETDIB(dest_scan, ArgbEncode(src_alpha, color_p[2], + color_p[1], color_p[0])); dest_scan += 4; continue; } |