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/agg/fx_agg_driver.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'core/fxge/agg/fx_agg_driver.cpp') diff --git a/core/fxge/agg/fx_agg_driver.cpp b/core/fxge/agg/fx_agg_driver.cpp index ab6ee49c7e..a19868f764 100644 --- a/core/fxge/agg/fx_agg_driver.cpp +++ b/core/fxge/agg/fx_agg_driver.cpp @@ -109,7 +109,7 @@ void RgbByteOrderCompositeRect(const RetainPtr& pBitmap, uint8_t back_alpha = dest_scan[3]; if (back_alpha == 0) { FXARGB_SETRGBORDERDIB(dest_scan, - FXARGB_MAKE(src_alpha, src_r, src_g, src_b)); + ArgbEncode(src_alpha, src_r, src_g, src_b)); dest_scan += 4; continue; } @@ -169,8 +169,8 @@ void RgbByteOrderTransferBitmap(const RetainPtr& pBitmap, 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; } @@ -213,7 +213,7 @@ void RgbByteOrderTransferBitmap(const RetainPtr& pBitmap, 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])); + ArgbEncode(0xff, src_scan[0], src_scan[1], src_scan[2])); dest_scan += 4; src_scan += 3; } @@ -230,7 +230,7 @@ void RgbByteOrderTransferBitmap(const RetainPtr& pBitmap, 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])); + ArgbEncode(0xff, src_scan[0], src_scan[1], src_scan[2])); src_scan += 4; dest_scan += 4; } -- cgit v1.2.3