From ceb3ab55ca5ad1fae590f50a09f04b7ed47656b1 Mon Sep 17 00:00:00 2001 From: dsinclair Date: Tue, 14 Feb 2017 14:59:30 +0000 Subject: Revert "Cleanup CPDF_MeshStream" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 9787a7441a905e582b10d9ffc425098b3233d36c. Reason for revert: Reverting chain to see if fixes Chrome roll. Original change's description: > Cleanup CPDF_MeshStream > > This CL converts the MeshVertex to a point and the TransformPoint to the > CFX_PointF override. > > Change-Id: I3faa5c14cedcf5af6aafca1c566acbc68577cca7 > Reviewed-on: https://pdfium-review.googlesource.com/2610 > Commit-Queue: dsinclair > Reviewed-by: Nicolás Peña > TBR=tsepez@chromium.org,dsinclair@chromium.org,npm@chromium.org,caryclark@google.com,pdfium-reviews@googlegroups.com NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Change-Id: Ie1b1dae3ede7581128a81cf7cd86a348c651233b Reviewed-on: https://pdfium-review.googlesource.com/2695 Reviewed-by: dsinclair Commit-Queue: dsinclair --- core/fpdfapi/page/cpdf_meshstream.cpp | 69 +++++++++++++---------------------- 1 file changed, 25 insertions(+), 44 deletions(-) (limited to 'core/fpdfapi/page/cpdf_meshstream.cpp') diff --git a/core/fpdfapi/page/cpdf_meshstream.cpp b/core/fpdfapi/page/cpdf_meshstream.cpp index 75069cab7f..b852901794 100644 --- a/core/fpdfapi/page/cpdf_meshstream.cpp +++ b/core/fpdfapi/page/cpdf_meshstream.cpp @@ -83,12 +83,6 @@ bool IsValidBitsPerFlag(uint32_t x) { } // namespace -CPDF_MeshVertex::CPDF_MeshVertex() = default; - -CPDF_MeshVertex::CPDF_MeshVertex(const CPDF_MeshVertex&) = default; - -CPDF_MeshVertex::~CPDF_MeshVertex() = default; - CPDF_MeshStream::CPDF_MeshStream( ShadingType type, const std::vector>& funcs, @@ -154,47 +148,37 @@ bool CPDF_MeshStream::Load() { return true; } -uint32_t CPDF_MeshStream::ReadFlag() { +uint32_t CPDF_MeshStream::GetFlag() { ASSERT(ShouldCheckBitsPerFlag(m_type)); return m_BitStream.GetBits(m_nFlagBits) & 0x03; } -CFX_PointF CPDF_MeshStream::ReadCoords() { +void CPDF_MeshStream::GetCoords(FX_FLOAT& x, FX_FLOAT& y) { ASSERT(ShouldCheckBPC(m_type)); - - CFX_PointF pos; if (m_nCoordBits == 32) { - pos.x = m_xmin + - m_BitStream.GetBits(m_nCoordBits) * (m_xmax - m_xmin) / - static_cast(m_CoordMax); - pos.y = m_ymin + - m_BitStream.GetBits(m_nCoordBits) * (m_ymax - m_ymin) / - static_cast(m_CoordMax); + x = m_xmin + (FX_FLOAT)(m_BitStream.GetBits(m_nCoordBits) * + (m_xmax - m_xmin) / (double)m_CoordMax); + y = m_ymin + (FX_FLOAT)(m_BitStream.GetBits(m_nCoordBits) * + (m_ymax - m_ymin) / (double)m_CoordMax); } else { - pos.x = m_xmin + - m_BitStream.GetBits(m_nCoordBits) * (m_xmax - m_xmin) / m_CoordMax; - pos.y = m_ymin + - m_BitStream.GetBits(m_nCoordBits) * (m_ymax - m_ymin) / m_CoordMax; + x = m_xmin + + m_BitStream.GetBits(m_nCoordBits) * (m_xmax - m_xmin) / m_CoordMax; + y = m_ymin + + m_BitStream.GetBits(m_nCoordBits) * (m_ymax - m_ymin) / m_CoordMax; } - return pos; } -std::tuple CPDF_MeshStream::ReadColor() { +void CPDF_MeshStream::GetColor(FX_FLOAT& r, FX_FLOAT& g, FX_FLOAT& b) { ASSERT(ShouldCheckBPC(m_type)); - FX_FLOAT color_value[kMaxComponents]; for (uint32_t i = 0; i < m_nComponents; ++i) { color_value[i] = m_ColorMin[i] + m_BitStream.GetBits(m_nComponentBits) * (m_ColorMax[i] - m_ColorMin[i]) / m_ComponentMax; } - - FX_FLOAT r; - FX_FLOAT g; - FX_FLOAT b; if (m_funcs.empty()) { m_pCS->GetRGB(color_value, r, g, b); - return std::tuple(r, g, b); + return; } FX_FLOAT result[kMaxComponents]; @@ -204,32 +188,29 @@ std::tuple CPDF_MeshStream::ReadColor() { if (func && func->CountOutputs() <= kMaxComponents) func->Call(color_value, 1, result, nResults); } - m_pCS->GetRGB(result, r, g, b); - return std::tuple(r, g, b); } -CPDF_MeshVertex CPDF_MeshStream::ReadVertex(const CFX_Matrix& pObject2Bitmap, - uint32_t* flag) { - *flag = ReadFlag(); - - CPDF_MeshVertex vertex; - vertex.position = pObject2Bitmap.Transform(ReadCoords()); - std::tie(vertex.r, vertex.g, vertex.b) = ReadColor(); +uint32_t CPDF_MeshStream::GetVertex(CPDF_MeshVertex& vertex, + CFX_Matrix* pObject2Bitmap) { + uint32_t flag = GetFlag(); + GetCoords(vertex.x, vertex.y); + pObject2Bitmap->TransformPoint(vertex.x, vertex.y); + GetColor(vertex.r, vertex.g, vertex.b); m_BitStream.ByteAlign(); - - return vertex; + return flag; } -bool CPDF_MeshStream::ReadVertexRow(const CFX_Matrix& pObject2Bitmap, - int count, - CPDF_MeshVertex* vertex) { +bool CPDF_MeshStream::GetVertexRow(CPDF_MeshVertex* vertex, + int count, + CFX_Matrix* pObject2Bitmap) { for (int i = 0; i < count; i++) { if (m_BitStream.IsEOF()) return false; - vertex[i].position = pObject2Bitmap.Transform(ReadCoords()); - std::tie(vertex[i].r, vertex[i].g, vertex[i].b) = ReadColor(); + GetCoords(vertex[i].x, vertex[i].y); + pObject2Bitmap->TransformPoint(vertex[i].x, vertex[i].y); + GetColor(vertex[i].r, vertex[i].g, vertex[i].b); m_BitStream.ByteAlign(); } return true; -- cgit v1.2.3