Remove CFX_Matrix.AsTuple().

Most use cases have been removed.

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

core/fxcrt/fx_coordinates.cpp

diff --git a/core/fxcrt/fx_coordinates.cpp b/core/fxcrt/fx_coordinates.cpp
index 6b5f5b0..dc48fb9 100644
--- a/core/fxcrt/fx_coordinates.cpp
+++ b/core/fxcrt/fx_coordinates.cpp
@@ -290,11 +290,6 @@
 }
 #endif  // NDEBUG
 
-std::tuple<float, float, float, float, float, float> CFX_Matrix::AsTuple()
-    const {
-  return std::make_tuple(a, b, c, d, e, f);
-}
-
 CFX_Matrix CFX_Matrix::GetInverse() const {
   CFX_Matrix inverse;
   float i = a * d - b * c;

core/fxcrt/fx_coordinates.h

diff --git a/core/fxcrt/fx_coordinates.h b/core/fxcrt/fx_coordinates.h
index c3ea480..622684f 100644
--- a/core/fxcrt/fx_coordinates.h
+++ b/core/fxcrt/fx_coordinates.h
@@ -8,7 +8,6 @@
 #define CORE_FXCRT_FX_COORDINATES_H_
 
 #include <algorithm>
-#include <tuple>
 
 #include "core/fxcrt/fx_system.h"
 #include "third_party/base/numerics/safe_math.h"
@@ -530,8 +529,6 @@
 
   CFX_Matrix(const CFX_Matrix& other) = default;
 
-  std::tuple<float, float, float, float, float, float> AsTuple() const;
-
   CFX_Matrix& operator=(const CFX_Matrix& other) = default;
 
   bool operator==(const CFX_Matrix& other) const {

core/fxcrt/fx_coordinates_unittest.cpp

diff --git a/core/fxcrt/fx_coordinates_unittest.cpp b/core/fxcrt/fx_coordinates_unittest.cpp
index b90bb8d..627c45d 100644
--- a/core/fxcrt/fx_coordinates_unittest.cpp
+++ b/core/fxcrt/fx_coordinates_unittest.cpp
@@ -334,17 +334,6 @@
   EXPECT_TRUE(m.IsIdentity());
 }
 
-TEST(CFX_Matrix, AsTuple) {
-  CFX_Matrix m(1, 2, 3, 4, 5, 6);
-  auto tuple = m.AsTuple();
-  EXPECT_FLOAT_EQ(1.0f, std::get<0>(tuple));
-  EXPECT_FLOAT_EQ(2.0f, std::get<1>(tuple));
-  EXPECT_FLOAT_EQ(3.0f, std::get<2>(tuple));
-  EXPECT_FLOAT_EQ(4.0f, std::get<3>(tuple));
-  EXPECT_FLOAT_EQ(5.0f, std::get<4>(tuple));
-  EXPECT_FLOAT_EQ(6.0f, std::get<5>(tuple));
-}
-
 TEST(CFX_Matrix, GetInverse) {
   static constexpr float data[6] = {3, 0, 2, 3, 1, 4};
   CFX_Matrix m(data);

fpdfsdk/fpdf_editimg.cpp

diff --git a/fpdfsdk/fpdf_editimg.cpp b/fpdfsdk/fpdf_editimg.cpp
index fc12b2b..2abe345 100644
--- a/fpdfsdk/fpdf_editimg.cpp
+++ b/fpdfsdk/fpdf_editimg.cpp
@@ -130,7 +130,13 @@
   if (!pImgObj || !a || !b || !c || !d || !e || !f)
     return false;
 
-  std::tie(*a, *b, *c, *d, *e, *f) = pImgObj->matrix().AsTuple();
+  const CFX_Matrix& matrix = pImgObj->matrix();
+  *a = matrix.a;
+  *b = matrix.b;
+  *c = matrix.c;
+  *d = matrix.d;
+  *e = matrix.e;
+  *f = matrix.f;
   return true;
 }