Fix more code which has shadow variables

The code has local variables that shadow struct or class member
variables. Also, when this happens, different variable names should be
used instead of namespaces.
These were discovered by /Wshadow warning flag in Clang.

Review-Url: https://codereview.chromium.org/2034253003

1 files changed, 7 insertions, 7 deletions

diff --git a/core/fxcrt/fx_basic_coords.cpp b/core/fxcrt/fx_basic_coords.cpp
index 4625bfd666..4c5dc55733 100644
--- a/core/fxcrt/fx_basic_coords.cpp
+++ b/core/fxcrt/fx_basic_coords.cpp
@@ -284,15 +284,15 @@ static void FXCRT_Matrix_Concat(CFX_Matrix& m,
   FX_FLOAT ff = m1.e * m2.b + m1.f * m2.d + m2.f;
   m.a = aa, m.b = bb, m.c = cc, m.d = dd, m.e = ee, m.f = ff;
 }
-void CFX_Matrix::Concat(FX_FLOAT a,
-                        FX_FLOAT b,
-                        FX_FLOAT c,
-                        FX_FLOAT d,
-                        FX_FLOAT e,
-                        FX_FLOAT f,
+void CFX_Matrix::Concat(FX_FLOAT a_in,
+                        FX_FLOAT b_in,
+                        FX_FLOAT c_in,
+                        FX_FLOAT d_in,
+                        FX_FLOAT e_in,
+                        FX_FLOAT f_in,
                         FX_BOOL bPrepended) {
   CFX_Matrix m;
-  m.Set(a, b, c, d, e, f);
+  m.Set(a_in, b_in, c_in, d_in, e_in, f_in);
   Concat(m, bPrepended);
 }
 void CFX_Matrix::Concat(const CFX_Matrix& m, FX_BOOL bPrepended) {