diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-04-12 15:31:05 -0400 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-04-12 20:14:48 +0000 |
| commit | f6baf6b1d101a889d2cfc7cb925e726dbffb89db (patch) | |
| tree | 6e174dc5228f3e4ea63bf5e0d4950517234278fd /xfa/fde | |
| parent | 81513c8243390783540b8bb6d0f9b26d9cb0c2c1 (diff) | |
| download | pdfium-f6baf6b1d101a889d2cfc7cb925e726dbffb89db.tar.xz | |
Fold CFGAS_Stream into CFGAS_TextStream.
Every CFGAS_Stream is wrapped inside a CFGAS_TextStream. This CL folds
the two classes together and merges the methods where needed.
Change-Id: Ic56449b36baa51254d8d600ce631f285ba2cbb80
Reviewed-on: https://pdfium-review.googlesource.com/4057
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: Nicolás Peña <npm@chromium.org>
Diffstat (limited to 'xfa/fde')
| -rw-r--r-- | xfa/fde/cfde_txtedtengine.cpp | 3 | ||||
| -rw-r--r-- | xfa/fde/xml/cfde_xmlsyntaxparser.cpp | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/xfa/fde/cfde_txtedtengine.cpp b/xfa/fde/cfde_txtedtengine.cpp index 633e0bc68e..b6471766db 100644 --- a/xfa/fde/cfde_txtedtengine.cpp +++ b/xfa/fde/cfde_txtedtengine.cpp @@ -117,8 +117,7 @@ void CFDE_TxtEdtEngine::SetTextByStream( } bool bPreIsCR = false; if (bValid) { - uint8_t bom[4]; - int32_t nPos = pStream->GetBOM(bom); + int32_t nPos = pStream->GetBOMLength(); pStream->Seek(FX_STREAMSEEK_Begin, nPos); int32_t nPlateSize = std::min(nStreamLength, m_pTxtBuf->GetChunkSize()); wchar_t* lpwstr = FX_Alloc(wchar_t, nPlateSize); diff --git a/xfa/fde/xml/cfde_xmlsyntaxparser.cpp b/xfa/fde/xml/cfde_xmlsyntaxparser.cpp index 57501cceca..51507526c2 100644 --- a/xfa/fde/xml/cfde_xmlsyntaxparser.cpp +++ b/xfa/fde/xml/cfde_xmlsyntaxparser.cpp @@ -106,9 +106,7 @@ CFDE_XMLSyntaxParser::CFDE_XMLSyntaxParser( m_CurNode.eNodeType = FDE_XMLNODE_Unknown; m_iXMLPlaneSize = std::min(m_iXMLPlaneSize, m_pStream->GetLength()); - - uint8_t bom[4]; - m_iCurrentPos = m_pStream->GetBOM(bom); + m_iCurrentPos = m_pStream->GetBOMLength(); FX_SAFE_INT32 alloc_size_safe = m_iXMLPlaneSize; alloc_size_safe += 1; // For NUL. |