From 162a31a6af1538acf7ac9835111626161287d742 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Tue, 29 May 2018 18:45:39 +0000 Subject: 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 Commit-Queue: Lei Zhang --- core/fxge/skia/fx_skia_device.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'core/fxge/skia/fx_skia_device.cpp') 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& 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& 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& 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; } -- cgit v1.2.3