From cfd4d57800835011b028435e064f13c29243d6e6 Mon Sep 17 00:00:00 2001 From: tsepez Date: Fri, 8 Apr 2016 14:38:54 -0700 Subject: Make converstion explicit from CFX_ByteString to uint8_t* BUG= Review URL: https://codereview.chromium.org/1868293002 --- fpdfsdk/fpdf_flatten.cpp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'fpdfsdk') diff --git a/fpdfsdk/fpdf_flatten.cpp b/fpdfsdk/fpdf_flatten.cpp index 99f97d7ca2..54e606397f 100644 --- a/fpdfsdk/fpdf_flatten.cpp +++ b/fpdfsdk/fpdf_flatten.cpp @@ -201,7 +201,7 @@ void SetPageContents(CFX_ByteString key, CFX_ByteString sStream; sStream.Format("q 1 0 0 1 0 0 cm /%s Do Q", key.c_str()); - pNewContents->SetData((const uint8_t*)sStream, sStream.GetLength(), FALSE, + pNewContents->SetData(sStream.raw_str(), sStream.GetLength(), FALSE, FALSE); } return; @@ -220,8 +220,7 @@ void SetPageContents(CFX_ByteString key, CFX_ByteString sBody = CFX_ByteString((const FX_CHAR*)acc.GetData(), acc.GetSize()); sStream = sStream + sBody + "\nQ"; - pContents->SetData((const uint8_t*)sStream, sStream.GetLength(), FALSE, - FALSE); + pContents->SetData(sStream.raw_str(), sStream.GetLength(), FALSE, FALSE); pContentsArray->AddReference(pDocument, dwObjNum); break; } @@ -247,8 +246,7 @@ void SetPageContents(CFX_ByteString key, CFX_ByteString sStream; sStream.Format("q 1 0 0 1 0 0 cm /%s Do Q", key.c_str()); - pNewContents->SetData((const uint8_t*)sStream, sStream.GetLength(), FALSE, - FALSE); + pNewContents->SetData(sStream.raw_str(), sStream.GetLength(), FALSE, FALSE); } } @@ -508,9 +506,7 @@ DLLEXPORT int STDCALL FPDFPage_Flatten(FPDF_PAGE page, int nFlag) { sTemp.Format("q %f 0 0 %f %f %f cm /%s Do Q\n", m.a, m.d, m.e, m.f, sFormName.c_str()); sStream += sTemp; - - pNewXObject->SetData((const uint8_t*)sStream, sStream.GetLength(), FALSE, - FALSE); + pNewXObject->SetData(sStream.raw_str(), sStream.GetLength(), FALSE, FALSE); } pPageDict->RemoveAt("Annots"); -- cgit v1.2.3