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/skia | |
| 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/skia')
| -rw-r--r-- | core/fxge/skia/fx_skia_device.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/core/fxge/skia/fx_skia_device.cpp b/core/fxge/skia/fx_skia_device.cpp index c68fd57798..0329eac104 100644 --- a/core/fxge/skia/fx_skia_device.cpp +++ b/core/fxge/skia/fx_skia_device.cpp @@ -84,8 +84,8 @@ void RgbByteOrderTransferBitmap(const RetainPtr<CFX_DIBitmap>& pBitmap, (uint8_t*)pSrcBitmap->GetScanline(src_top + row) + src_left * Bpp; if (Bpp == 4) { for (int col = 0; col < width; col++) { - FXARGB_SETDIB(dest_scan, FXARGB_MAKE(src_scan[3], src_scan[0], - src_scan[1], src_scan[2])); + FXARGB_SETDIB(dest_scan, ArgbEncode(src_scan[3], src_scan[0], + src_scan[1], src_scan[2])); dest_scan += 4; src_scan += 4; } @@ -128,8 +128,8 @@ void RgbByteOrderTransferBitmap(const RetainPtr<CFX_DIBitmap>& pBitmap, uint8_t* src_scan = (uint8_t*)pSrcBitmap->GetScanline(src_top + row) + src_left * 3; for (int col = 0; col < width; col++) { - FXARGB_SETDIB(dest_scan, FXARGB_MAKE(0xff, src_scan[0], src_scan[1], - src_scan[2])); + FXARGB_SETDIB(dest_scan, ArgbEncode(0xff, src_scan[0], src_scan[1], + src_scan[2])); dest_scan += 4; src_scan += 3; } @@ -141,8 +141,8 @@ void RgbByteOrderTransferBitmap(const RetainPtr<CFX_DIBitmap>& pBitmap, uint8_t* src_scan = (uint8_t*)(pSrcBitmap->GetScanline(src_top + row) + src_left * 4); for (int col = 0; col < width; col++) { - FXARGB_SETDIB(dest_scan, FXARGB_MAKE(0xff, src_scan[0], src_scan[1], - src_scan[2])); + FXARGB_SETDIB(dest_scan, ArgbEncode(0xff, src_scan[0], src_scan[1], + src_scan[2])); src_scan += 4; dest_scan += 4; } |