1 files changed, 10 insertions, 15 deletions
diff --git a/core/fpdfapi/page/cpdf_meshstream.h b/core/fpdfapi/page/cpdf_meshstream.h
index 24f1d66cfd..21a6c2fa8c 100644
--- a/core/fpdfapi/page/cpdf_meshstream.h
+++ b/core/fpdfapi/page/cpdf_meshstream.h
@@ -8,7 +8,6 @@
 #define CORE_FPDFAPI_PAGE_CPDF_MESHSTREAM_H_
 
 #include <memory>
-#include <tuple>
 #include <vector>
 
 #include "core/fpdfapi/page/cpdf_shadingpattern.h"
@@ -16,13 +15,9 @@
 #include "core/fxcrt/fx_basic.h"
 #include "core/fxcrt/fx_system.h"
 
-class CPDF_MeshVertex {
- public:
-  CPDF_MeshVertex();
-  CPDF_MeshVertex(const CPDF_MeshVertex&);
-  ~CPDF_MeshVertex();
-
-  CFX_PointF position;
+struct CPDF_MeshVertex {
+  FX_FLOAT x;
+  FX_FLOAT y;
   FX_FLOAT r;
   FX_FLOAT g;
   FX_FLOAT b;
@@ -42,14 +37,14 @@ class CPDF_MeshStream {
 
   bool Load();
 
-  uint32_t ReadFlag();
-  CFX_PointF ReadCoords();
-  std::tuple<FX_FLOAT, FX_FLOAT, FX_FLOAT> ReadColor();
+  uint32_t GetFlag();
+  void GetCoords(FX_FLOAT& x, FX_FLOAT& y);
+  void GetColor(FX_FLOAT& r, FX_FLOAT& g, FX_FLOAT& b);
 
-  CPDF_MeshVertex ReadVertex(const CFX_Matrix& pObject2Bitmap, uint32_t* flag);
-  bool ReadVertexRow(const CFX_Matrix& pObject2Bitmap,
-                     int count,
-                     CPDF_MeshVertex* vertex);
+  uint32_t GetVertex(CPDF_MeshVertex& vertex, CFX_Matrix* pObject2Bitmap);
+  bool GetVertexRow(CPDF_MeshVertex* vertex,
+                    int count,
+                    CFX_Matrix* pObject2Bitmap);
 
   CFX_BitStream* BitStream() { return &m_BitStream; }
   uint32_t ComponentBits() const { return m_nComponentBits; }