commit 221055c8f7d9a4dced1d857d5128c16b1d10364d
author Lei Zhang <thestig@chromium.org> Tue Sep 27 00:02:15 2022 +0000
committer Pdfium LUCI CQ <pdfium-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Sep 27 00:02:15 2022 +0000
tree de213f6b1a49155149ba1eec744c29cc0ae35a05
parent 47d4b58c611f0fa364307527c7ab6a26198d6fea

Rearrange some variables inside CPDF_RenderShading::Draw().

In CPDF_RenderShading::Draw(), declare variables closer to when first
used. Also rename a variable that does not fit any known naming style.

Change-Id: I212811c28fe70f9773f25ac800e1f38431d44a7c
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/98532
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Nigi <nigi@chromium.org>

core/fpdfapi/render/cpdf_rendershading.cpp

diff --git a/core/fpdfapi/render/cpdf_rendershading.cpp b/core/fpdfapi/render/cpdf_rendershading.cpp
index ba06563..dd14e16 100644
--- a/core/fpdfapi/render/cpdf_rendershading.cpp
+++ b/core/fpdfapi/render/cpdf_rendershading.cpp
@@ -876,14 +876,13 @@
                               const FX_RECT& clip_rect,
                               int alpha,
                               const CPDF_RenderOptions& options) {
-  const auto& funcs = pPattern->GetFuncs();
-  RetainPtr<const CPDF_Dictionary> pDict =
-      pPattern->GetShadingObject()->GetDict();
   RetainPtr<CPDF_ColorSpace> pColorSpace = pPattern->GetCS();
   if (!pColorSpace)
     return;
 
   FX_ARGB background = 0;
+  RetainPtr<const CPDF_Dictionary> pDict =
+      pPattern->GetShadingObject()->GetDict();
   if (!pPattern->IsShadingObject() && pDict->KeyExist("Background")) {
     RetainPtr<const CPDF_Array> pBackColor = pDict->GetArrayFor("Background");
     if (pBackColor && pBackColor->size() >= pColorSpace->CountComponents()) {
@@ -914,26 +913,27 @@
   if (!buffer.Initialize())
     return;
 
-  CFX_Matrix FinalMatrix = mtMatrix * buffer.GetMatrix();
   RetainPtr<CFX_DIBitmap> pBitmap = buffer.GetBitmap();
   if (!pBitmap->GetBuffer())
     return;
 
   pBitmap->Clear(background);
+  const CFX_Matrix final_matrix = mtMatrix * buffer.GetMatrix();
+  const auto& funcs = pPattern->GetFuncs();
   switch (pPattern->GetShadingType()) {
     case kInvalidShading:
     case kMaxShading:
       return;
     case kFunctionBasedShading:
-      DrawFuncShading(pBitmap, FinalMatrix, pDict.Get(), funcs, pColorSpace,
+      DrawFuncShading(pBitmap, final_matrix, pDict.Get(), funcs, pColorSpace,
                       alpha);
       break;
     case kAxialShading:
-      DrawAxialShading(pBitmap, FinalMatrix, pDict.Get(), funcs, pColorSpace,
+      DrawAxialShading(pBitmap, final_matrix, pDict.Get(), funcs, pColorSpace,
                        alpha);
       break;
     case kRadialShading:
-      DrawRadialShading(pBitmap, FinalMatrix, pDict.Get(), funcs, pColorSpace,
+      DrawRadialShading(pBitmap, final_matrix, pDict.Get(), funcs, pColorSpace,
                         alpha);
       break;
     case kFreeFormGouraudTriangleMeshShading: {
@@ -941,7 +941,7 @@
       // the case of dictionary at the moment.
       const CPDF_Stream* pStream = ToStream(pPattern->GetShadingObject());
       if (pStream) {
-        DrawFreeGouraudShading(pBitmap, FinalMatrix, pStream, funcs,
+        DrawFreeGouraudShading(pBitmap, final_matrix, pStream, funcs,
                                pColorSpace, alpha);
       }
       break;
@@ -951,7 +951,7 @@
       // the case of dictionary at the moment.
       const CPDF_Stream* pStream = ToStream(pPattern->GetShadingObject());
       if (pStream) {
-        DrawLatticeGouraudShading(pBitmap, FinalMatrix, pStream, funcs,
+        DrawLatticeGouraudShading(pBitmap, final_matrix, pStream, funcs,
                                   pColorSpace, alpha);
       }
       break;
@@ -962,7 +962,7 @@
       // the case of dictionary at the moment.
       const CPDF_Stream* pStream = ToStream(pPattern->GetShadingObject());
       if (pStream) {
-        DrawCoonPatchMeshes(pPattern->GetShadingType(), pBitmap, FinalMatrix,
+        DrawCoonPatchMeshes(pPattern->GetShadingType(), pBitmap, final_matrix,
                             pStream, funcs, pColorSpace,
                             options.GetOptions().bNoPathSmooth, alpha);
       }