From 0ba3c6da16d4e90f0ad1fc9f326bf863860c0470 Mon Sep 17 00:00:00 2001 From: Henrique Nakashima Date: Wed, 5 Jul 2017 16:21:17 -0400 Subject: Converting CFX_ByteTextBuf to ostringstream in fpdfedittext.cpp. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: pdfium:731 Change-Id: I8005ca2c2d4a65ad2197ba6f71ee37f1c1e5b5d8 Reviewed-on: https://pdfium-review.googlesource.com/6833 Reviewed-by: Nicolás Peña Reviewed-by: dsinclair Commit-Queue: Henrique Nakashima --- fpdfsdk/fpdfedittext.cpp | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/fpdfsdk/fpdfedittext.cpp b/fpdfsdk/fpdfedittext.cpp index 1c3b22d7f3..f15f9e4e6a 100644 --- a/fpdfsdk/fpdfedittext.cpp +++ b/fpdfsdk/fpdfedittext.cpp @@ -98,24 +98,24 @@ const char ToUnicodeEnd[] = "end\n" "end\n"; -void AddCharcode(CFX_ByteTextBuf* pBuffer, uint32_t number) { +void AddCharcode(std::ostringstream* pBuffer, uint32_t number) { ASSERT(number <= 0xFFFF); *pBuffer << "<"; char ans[4]; FXSYS_IntToFourHexChars(number, ans); for (size_t i = 0; i < 4; ++i) - pBuffer->AppendChar(ans[i]); + *pBuffer << ans[i]; *pBuffer << ">"; } // PDF spec 1.7 Section 5.9.2: "Unicode character sequences as expressed in // UTF-16BE encoding." See https://en.wikipedia.org/wiki/UTF-16#Description -void AddUnicode(CFX_ByteTextBuf* pBuffer, uint32_t unicode) { +void AddUnicode(std::ostringstream* pBuffer, uint32_t unicode) { char ans[8]; *pBuffer << "<"; size_t numChars = FXSYS_ToUTF16BE(unicode, ans); for (size_t i = 0; i < numChars; ++i) - pBuffer->AppendChar(ans[i]); + *pBuffer << ans[i]; *pBuffer << ">"; } @@ -184,7 +184,7 @@ CPDF_Stream* LoadUnicode(CPDF_Document* pDoc, } map_range[std::make_pair(firstCharcode, curCharcode)] = firstUnicode; } - CFX_ByteTextBuf buffer; + std::ostringstream buffer; buffer << ToUnicodeStart; // Add maps to buffer buffer << static_cast(char_to_uni.size()) << " beginbfchar\n"; @@ -224,11 +224,9 @@ CPDF_Stream* LoadUnicode(CPDF_Document* pDoc, buffer << "endbfrange\n"; buffer << ToUnicodeEnd; // TODO(npm): Encrypt / Compress? - uint32_t bufferSize = buffer.GetSize(); - auto pDict = pdfium::MakeUnique(); - pDict->SetNewFor("Length", static_cast(bufferSize)); - return pDoc->NewIndirect(buffer.DetachBuffer(), bufferSize, - std::move(pDict)); + CPDF_Stream* stream = pDoc->NewIndirect(); + stream->SetData(&buffer); + return stream; } const uint32_t kMaxSimpleFontChar = 0xFF; -- cgit v1.2.3