Remove typdefs for pointer types in fx_system.h

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 "../../public/fpdf_flatten.h"
 #include "../include/fsdk_define.h"
 
 typedef CFX_ArrayTemplate<CPDF_Dictionary*> CPDF_ObjectArray;
@@ skipping 199 matching lines @@
         if (!pContentsObj)
         {
                 //Create a new contents dictionary
                 if (!key.IsEmpty())
                 {
                         CPDF_Stream* pNewContents = new CPDF_Stream(NULL, 0, new CPDF_Dictionary);
                         pPage->SetAtReference("Contents", pDocument, pDocument->AddIndirectObject(pNewContents));
 
                         CFX_ByteString sStream;
                         sStream.Format("q 1 0 0 1 0 0 cm /%s Do Q", key.c_str());
-                        pNewContents->SetData((FX_LPCBYTE)sStream, sStream.GetLength(), FALSE, FALSE);
+                        pNewContents->SetData((const uint8_t*)sStream, sStream.GetLength(), FALSE, FALSE);
                 }
                 return;
         }
 
         int iType = pContentsObj->GetType();
         CPDF_Array* pContentsArray = NULL;
         
         switch(iType)
         {
         case PDFOBJ_STREAM:
                 {
                         pContentsArray = new CPDF_Array;
                         CPDF_Stream* pContents = (CPDF_Stream*)pContentsObj;
                         FX_DWORD dwObjNum = pDocument->AddIndirectObject(pContents);
                         CPDF_StreamAcc acc;
                         acc.LoadAllData(pContents);
                         CFX_ByteString sStream = "q\n";
-                        CFX_ByteString sBody = CFX_ByteString((FX_LPCSTR)acc.GetData(), acc.GetSize());
+                        CFX_ByteString sBody = CFX_ByteString((const FX_CHAR*)acc.GetData(), acc.GetSize());
                         sStream = sStream + sBody + "\nQ";
-                        pContents->SetData((FX_LPCBYTE)sStream, sStream.GetLength(), FALSE, FALSE);
+                        pContents->SetData((const uint8_t*)sStream, sStream.GetLength(), FALSE, FALSE);
                         pContentsArray->AddReference(pDocument, dwObjNum);
                         break;
                 }
                 
         case PDFOBJ_ARRAY:
                 {
                         pContentsArray = (CPDF_Array*)pContentsObj;
                         break;
                 }
         default:
                 break;
         }       
         
         if (!pContentsArray)return;
         
         FX_DWORD dwObjNum = pDocument->AddIndirectObject(pContentsArray);
         pPage->SetAtReference("Contents", pDocument, dwObjNum);
         
         if (!key.IsEmpty())
         {
                 CPDF_Stream* pNewContents = new CPDF_Stream(NULL, 0, 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", key.c_str());
-                pNewContents->SetData((FX_LPCBYTE)sStream, sStream.GetLength(), FALSE, FALSE);
+                pNewContents->SetData((const uint8_t*)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);
         rcStream.Normalize();
@@ skipping 235 matching lines @@
                 }
 
                 CFX_ByteString sFormName;
                 sFormName.Format("F%d", i);
                 FX_DWORD dwObjNum = pDocument->AddIndirectObject(pObj);
                 pXObject->SetAtReference(sFormName, pDocument, dwObjNum);
 
                 CPDF_StreamAcc acc;
                 acc.LoadAllData(pNewXObject);
 
-                FX_LPCBYTE pData = acc.GetData();
+                const uint8_t* pData = acc.GetData();
                 CFX_ByteString sStream(pData, acc.GetSize());
                 CFX_ByteString sTemp;
 
                 if (matrix.IsIdentity())
                 {
                         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, sFormName.c_str());
                 sStream += sTemp;
 
-                pNewXObject->SetData((FX_LPCBYTE)sStream, sStream.GetLength(), FALSE, FALSE);
+                pNewXObject->SetData((const uint8_t*)sStream, sStream.GetLength(), FALSE, FALSE);
         }
         pPageDict->RemoveAt( "Annots" );
 
         ObjectArray.RemoveAll();
         RectArray.RemoveAll();
 
         return FLATTEN_SUCCESS;
 }