Get rid of FX_LPCSTR cast.

fpdfsdk/src/fpdf_flatten.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "../include/fsdk_define.h"
 #include "../include/fpdf_flatten.h"
 
 typedef CFX_ArrayTemplate<CPDF_Dictionary*> CPDF_ObjectArray;
@@ skipping 202 matching lines @@
         if (!pContentsObj)
         {
                 //Create a new contents dictionary
                 if (!key.IsEmpty())
                 {
                         CPDF_Stream* pNewContents = FX_NEW CPDF_Stream(NULL, 0, FX_NEW CPDF_Dictionary);
                         if (!pNewContents)return;
                         pPage->SetAtReference("Contents", pDocument, pDocument->AddIndirectObject(pNewContents));
                         
                         CFX_ByteString sStream;
-                        sStream.Format("q 1 0 0 1 0 0 cm /%s Do Q", (FX_LPCSTR)key);
+            sStream.Format("q 1 0 0 1 0 0 cm /%s Do Q", key.c_str());

[brucedawson, 2014/12/30 23:13:02]

What happened to the indenting here? Tabs versus spaces? The inconsistency makes
it misaligned in the review tool.

                         pNewContents->SetData((FX_LPCBYTE)sStream, sStream.GetLength(), FALSE, FALSE);
                 }
                 return;
         }
 
         int iType = pContentsObj->GetType();
         CPDF_Array* pContentsArray = NULL;
         
         switch(iType)
         {
@@ skipping 26 matching lines @@
         FX_DWORD dwObjNum = pDocument->AddIndirectObject(pContentsArray);
         pPage->SetAtReference("Contents", pDocument, dwObjNum);
         
         if (!key.IsEmpty())
         {
                 CPDF_Stream* pNewContents = FX_NEW CPDF_Stream(NULL, 0, FX_NEW CPDF_Dictionary);
                 dwObjNum = pDocument->AddIndirectObject(pNewContents);
                 pContentsArray->AddReference(pDocument, dwObjNum);
                 
                 CFX_ByteString sStream;
-                sStream.Format("q 1 0 0 1 0 0 cm /%s Do Q", (FX_LPCSTR)key);
+        sStream.Format("q 1 0 0 1 0 0 cm /%s Do Q", key.c_str());

[brucedawson, 2014/12/30 23:13:02]

Ditto on the indenting.

                 pNewContents->SetData((FX_LPCBYTE)sStream, sStream.GetLength(), FALSE, FALSE);
         }
 }
  
 CFX_AffineMatrix GetMatrix(CPDF_Rect rcAnnot, CPDF_Rect rcStream, CFX_AffineMatrix matrix)
 {
         if(rcStream.IsEmpty())
                 return CFX_AffineMatrix();
         
         matrix.TransformRect(rcStream);
@@ skipping 259 matching lines @@
                 {
                         matrix.a = 1.0f;
                         matrix.b = 0.0f;
                         matrix.c = 0.0f;
                         matrix.d = 1.0f;
                         matrix.e = 0.0f;
                         matrix.f = 0.0f;
                 }
 
                 CFX_AffineMatrix m = GetMatrix(rcAnnot, rcStream, matrix);
-                sTemp.Format("q %f 0 0 %f %f %f cm /%s Do Q\n", m.a, m.d, m.e, m.f, (FX_LPCSTR)sFormName);
+        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());

[brucedawson, 2014/12/30 23:13:02]

Ditto on the indenting.

                 sStream += sTemp;
 
                 pNewXObject->SetData((FX_LPCBYTE)sStream, sStream.GetLength(), FALSE, FALSE);
         }
         pPageDict->RemoveAt( "Annots" );
 
         ObjectArray.RemoveAll();
         RectArray.RemoveAll();
 
         return FLATTEN_SUCCESS;
 }