Initialize CPDF_TextState members in the header. Change-Id: I94b9d36e348ef30c66872963b9af8035eaae046f Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/67630 Reviewed-by: Tom Sepez <tsepez@chromium.org> Commit-Queue: Lei Zhang <thestig@chromium.org>
diff --git a/core/fpdfapi/page/cpdf_textstate.cpp b/core/fpdfapi/page/cpdf_textstate.cpp index b8019d5..d8ede16 100644 --- a/core/fpdfapi/page/cpdf_textstate.cpp +++ b/core/fpdfapi/page/cpdf_textstate.cpp
@@ -78,18 +78,7 @@ return m_Ref.GetPrivateCopy()->m_CTM; } -CPDF_TextState::TextData::TextData() - : m_pFont(nullptr), - m_pDocument(nullptr), - m_FontSize(1.0f), - m_CharSpace(0), - m_WordSpace(0), - m_TextMode(TextRenderingMode::MODE_FILL) { - m_Matrix[0] = m_Matrix[3] = 1.0f; - m_Matrix[1] = m_Matrix[2] = 0; - m_CTM[0] = m_CTM[3] = 1.0f; - m_CTM[1] = m_CTM[2] = 0; -} +CPDF_TextState::TextData::TextData() = default; CPDF_TextState::TextData::TextData(const TextData& that) : m_pFont(that.m_pFont),
diff --git a/core/fpdfapi/page/cpdf_textstate.h b/core/fpdfapi/page/cpdf_textstate.h index 5cc0c1d..4ce70c3 100644 --- a/core/fpdfapi/page/cpdf_textstate.h +++ b/core/fpdfapi/page/cpdf_textstate.h
@@ -72,12 +72,12 @@ RetainPtr<CPDF_Font> m_pFont; UnownedPtr<CPDF_Document> m_pDocument; - float m_FontSize; - float m_CharSpace; - float m_WordSpace; - TextRenderingMode m_TextMode; - float m_Matrix[4]; - float m_CTM[4]; + float m_FontSize = 1.0f; + float m_CharSpace = 0.0f; + float m_WordSpace = 0.0f; + TextRenderingMode m_TextMode = TextRenderingMode::MODE_FILL; + float m_Matrix[4] = {1.0f, 0.0f, 0.0f, 1.0f}; + float m_CTM[4] = {1.0f, 0.0f, 0.0f, 1.0f}; private: TextData();