summaryrefslogtreecommitdiff
path: root/core/fpdfapi/page
diff options
context:
space:
mode:
Diffstat (limited to 'core/fpdfapi/page')
-rw-r--r--core/fpdfapi/page/cpdf_meshstream.cpp21
-rw-r--r--core/fpdfapi/page/cpdf_meshstream.h5
2 files changed, 14 insertions, 12 deletions
diff --git a/core/fpdfapi/page/cpdf_meshstream.cpp b/core/fpdfapi/page/cpdf_meshstream.cpp
index 7a6228a25b..8588734d95 100644
--- a/core/fpdfapi/page/cpdf_meshstream.cpp
+++ b/core/fpdfapi/page/cpdf_meshstream.cpp
@@ -242,19 +242,22 @@ bool CPDF_MeshStream::ReadVertex(const CFX_Matrix& pObject2Bitmap,
return true;
}
-bool CPDF_MeshStream::ReadVertexRow(const CFX_Matrix& pObject2Bitmap,
- int count,
- CPDF_MeshVertex* vertex) {
- for (int i = 0; i < count; i++) {
+std::vector<CPDF_MeshVertex> CPDF_MeshStream::ReadVertexRow(
+ const CFX_Matrix& pObject2Bitmap,
+ int count) {
+ std::vector<CPDF_MeshVertex> vertices;
+ for (int i = 0; i < count; ++i) {
if (m_BitStream.IsEOF() || !CanReadCoords())
- return false;
+ return std::vector<CPDF_MeshVertex>();
- vertex[i].position = pObject2Bitmap.Transform(ReadCoords());
+ vertices.push_back(CPDF_MeshVertex());
+ CPDF_MeshVertex& vertex = vertices.back();
+ vertex.position = pObject2Bitmap.Transform(ReadCoords());
if (!CanReadColor())
- return false;
+ return std::vector<CPDF_MeshVertex>();
- std::tie(vertex[i].r, vertex[i].g, vertex[i].b) = ReadColor();
+ std::tie(vertex.r, vertex.g, vertex.b) = ReadColor();
m_BitStream.ByteAlign();
}
- return true;
+ return vertices;
}
diff --git a/core/fpdfapi/page/cpdf_meshstream.h b/core/fpdfapi/page/cpdf_meshstream.h
index af636a964d..60c47790a4 100644
--- a/core/fpdfapi/page/cpdf_meshstream.h
+++ b/core/fpdfapi/page/cpdf_meshstream.h
@@ -54,9 +54,8 @@ class CPDF_MeshStream {
bool ReadVertex(const CFX_Matrix& pObject2Bitmap,
CPDF_MeshVertex* vertex,
uint32_t* flag);
- bool ReadVertexRow(const CFX_Matrix& pObject2Bitmap,
- int count,
- CPDF_MeshVertex* vertex);
+ std::vector<CPDF_MeshVertex> ReadVertexRow(const CFX_Matrix& pObject2Bitmap,
+ int count);
CFX_BitStream* BitStream() { return &m_BitStream; }
uint32_t ComponentBits() const { return m_nComponentBits; }