commit 153af9451acd5eead2a07d144517d2a9349d72fb
author Lei Zhang <thestig@chromium.org> Sat Oct 24 01:15:39 2020 +0000
committer Chromium commit bot <commit-bot@chromium.org> Sat Oct 24 01:15:39 2020 +0000
tree 540ef4ab3aaa6a8a36a1d9e6b224f3b1706fabaa
parent ec2aca0e62f7c3c4cc7c8c5a6399baf5ef9a2786

Split the lambda expression inside CFX_ImageTransformer::CalcColor().

The lambda expression runs in the inner-most loop inside the
DoBilinearLoop() call. Split it into 3, so the lambda expressions no
longer have any conditionals. At the cost of some duplicated code, the
DoBilinearLoop() operations should run faster.

Change-Id: Iae583f864721ffe419d187c1114230ef010cab07
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/75690
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>

core/fxge/dib/cfx_imagetransformer.cpp

diff --git a/core/fxge/dib/cfx_imagetransformer.cpp b/core/fxge/dib/cfx_imagetransformer.cpp
index 7114167..ffcc7d9 100644
--- a/core/fxge/dib/cfx_imagetransformer.cpp
+++ b/core/fxge/dib/cfx_imagetransformer.cpp
@@ -323,25 +323,36 @@
                                      FXDIB_Format format,
                                      int Bpp) {
   DCHECK(format == FXDIB_Format::k8bppMask || format == FXDIB_Format::kArgb);
-  bool bHasAlpha = m_Storer.GetBitmap()->HasAlpha();
-  int destBpp = calc_data.bitmap->GetBPP() / 8;
-  auto func = [&calc_data, format, Bpp, bHasAlpha](const BilinearData& data,
-                                                   uint8_t* dest) {
-    uint8_t blue_c = BilinearInterpolate(calc_data.buf, data, Bpp, 0);
-    uint8_t green_m = BilinearInterpolate(calc_data.buf, data, Bpp, 1);
-    uint8_t red_y = BilinearInterpolate(calc_data.buf, data, Bpp, 2);
+  const int destBpp = calc_data.bitmap->GetBPP() / 8;
+  if (!m_Storer.GetBitmap()->HasAlpha()) {
+    auto func = [&calc_data, Bpp](const BilinearData& data, uint8_t* dest) {
+      uint8_t b = BilinearInterpolate(calc_data.buf, data, Bpp, 0);
+      uint8_t g = BilinearInterpolate(calc_data.buf, data, Bpp, 1);
+      uint8_t r = BilinearInterpolate(calc_data.buf, data, Bpp, 2);
+      *reinterpret_cast<uint32_t*>(dest) = ArgbEncode(kOpaqueAlpha, r, g, b);
+    };
+    DoBilinearLoop(calc_data, m_result, m_StretchClip, destBpp, func);
+    return;
+  }
 
-    uint32_t* dest32 = reinterpret_cast<uint32_t*>(dest);
-    if (bHasAlpha) {
-      uint8_t alpha_k = BilinearInterpolate(calc_data.buf, data, Bpp, 3);
-      if (format == FXDIB_Format::kArgb) {
-        *dest32 = ArgbEncode(alpha_k, red_y, green_m, blue_c);
-      } else {
-        *dest32 = FXCMYK_TODIB(CmykEncode(blue_c, green_m, red_y, alpha_k));
-      }
-    } else {
-      *dest32 = ArgbEncode(kOpaqueAlpha, red_y, green_m, blue_c);
-    }
+  if (format == FXDIB_Format::kArgb) {
+    auto func = [&calc_data, Bpp](const BilinearData& data, uint8_t* dest) {
+      uint8_t b = BilinearInterpolate(calc_data.buf, data, Bpp, 0);
+      uint8_t g = BilinearInterpolate(calc_data.buf, data, Bpp, 1);
+      uint8_t r = BilinearInterpolate(calc_data.buf, data, Bpp, 2);
+      uint8_t alpha = BilinearInterpolate(calc_data.buf, data, Bpp, 3);
+      *reinterpret_cast<uint32_t*>(dest) = ArgbEncode(alpha, r, g, b);
+    };
+    DoBilinearLoop(calc_data, m_result, m_StretchClip, destBpp, func);
+    return;
+  }
+
+  auto func = [&calc_data, Bpp](const BilinearData& data, uint8_t* dest) {
+    uint8_t c = BilinearInterpolate(calc_data.buf, data, Bpp, 0);
+    uint8_t m = BilinearInterpolate(calc_data.buf, data, Bpp, 1);
+    uint8_t y = BilinearInterpolate(calc_data.buf, data, Bpp, 2);
+    uint8_t k = BilinearInterpolate(calc_data.buf, data, Bpp, 3);
+    *reinterpret_cast<uint32_t*>(dest) = FXCMYK_TODIB(CmykEncode(c, m, y, k));
   };
   DoBilinearLoop(calc_data, m_result, m_StretchClip, destBpp, func);
 }