Replace FX_NEW with new, remove tests from fpdfsdk

fpdfsdk/src/fsdk_baseannot.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/fsdk_mgr.h"
 #include "../include/fsdk_baseannot.h"
 
@@ skipping 762 matching lines @@
 //border
 void CPDFSDK_Annot::SetBorderWidth(int nWidth)
 {
         ASSERT(m_pAnnot != NULL);
         ASSERT(m_pAnnot->m_pAnnotDict != NULL);
 
         CPDF_Array* pBorder = m_pAnnot->m_pAnnotDict->GetArray("Border");
 
         if (pBorder)
         {
-                pBorder->SetAt(2, FX_NEW CPDF_Number(nWidth));
+                pBorder->SetAt(2, new CPDF_Number(nWidth));
         }
         else
         {
                 CPDF_Dictionary* pBSDict = m_pAnnot->m_pAnnotDict->GetDict("BS");
 
                 if (!pBSDict)
                 {
-                        pBSDict = FX_NEW CPDF_Dictionary;
+                        pBSDict = new CPDF_Dictionary;
                         m_pAnnot->m_pAnnotDict->SetAt("BS", pBSDict);
                 }
 
                 pBSDict->SetAtInteger("W", nWidth);
         }
 }
 
 int     CPDFSDK_Annot::GetBorderWidth() const
 {
         ASSERT(m_pAnnot != NULL);
@@ skipping 18 matching lines @@
 }
 
 void CPDFSDK_Annot::SetBorderStyle(int nStyle)
 {
         ASSERT(m_pAnnot != NULL);
         ASSERT(m_pAnnot->m_pAnnotDict != NULL);
 
         CPDF_Dictionary* pBSDict = m_pAnnot->m_pAnnotDict->GetDict("BS");
         if (!pBSDict)
         {
-                pBSDict = FX_NEW CPDF_Dictionary;
+                pBSDict = new CPDF_Dictionary;
                 m_pAnnot->m_pAnnotDict->SetAt("BS", pBSDict);
         }
 
         switch (nStyle)
         {
         case BBS_SOLID:
                 pBSDict->SetAtName("S", "S");
                 break;
         case BBS_DASH:
                 pBSDict->SetAtName("S", "D");
@@ skipping 41 matching lines @@
 }
 
 void CPDFSDK_Annot::SetBorderDash(const CFX_IntArray& array)
 {
         ASSERT(m_pAnnot != NULL);
         ASSERT(m_pAnnot->m_pAnnotDict != NULL);
 
         CPDF_Dictionary* pBSDict = m_pAnnot->m_pAnnotDict->GetDict("BS");
         if (!pBSDict)
         {
-                pBSDict = FX_NEW CPDF_Dictionary;
+                pBSDict = new CPDF_Dictionary;
                 m_pAnnot->m_pAnnotDict->SetAt("BS", pBSDict);
         }
 
-        CPDF_Array* pArray = FX_NEW CPDF_Array;
+        CPDF_Array* pArray = new CPDF_Array;
         for (int i=0,sz=array.GetSize(); i<sz; i++)
         {
                 pArray->AddInteger(array[i]);
         }
 
         pBSDict->SetAt("D", pArray);
 }
 
 void CPDFSDK_Annot::GetBorderDash(CFX_IntArray& array) const
 {
@@ skipping 23 matching lines @@
                         array.Add(pDash->GetInteger(i));
                 }
         }
 }
 
 void CPDFSDK_Annot::SetColor(FX_COLORREF color)
 {
         ASSERT(m_pAnnot != NULL);
         ASSERT(m_pAnnot->m_pAnnotDict != NULL);
 
-        CPDF_Array* pArray = FX_NEW CPDF_Array;
+        CPDF_Array* pArray = new CPDF_Array;
         pArray->AddNumber((FX_FLOAT)FXSYS_GetRValue(color) / 255.0f);
         pArray->AddNumber((FX_FLOAT)FXSYS_GetGValue(color) / 255.0f);
         pArray->AddNumber((FX_FLOAT)FXSYS_GetBValue(color) / 255.0f);
         m_pAnnot->m_pAnnotDict->SetAt("C", pArray);
 }
 
 void CPDFSDK_Annot::RemoveColor()
 {
         ASSERT(m_pAnnot != NULL);
         ASSERT(m_pAnnot->m_pAnnotDict != NULL);
@@ skipping 52 matching lines @@
                                                                 const CPDF_Matrix& matrix, const CFX_ByteString& sContents,
                                                                 const CFX_ByteString& sAPState)
 {
         ASSERT(m_pAnnot != NULL);
         ASSERT(m_pAnnot->m_pAnnotDict != NULL);
         
         CPDF_Dictionary* pAPDict = m_pAnnot->m_pAnnotDict->GetDict("AP");
         
         if (!pAPDict) 
         {
-                pAPDict = FX_NEW CPDF_Dictionary;
+                pAPDict = new CPDF_Dictionary;
                 m_pAnnot->m_pAnnotDict->SetAt("AP", pAPDict);
         }
         
         CPDF_Stream* pStream = NULL;
         CPDF_Dictionary* pParentDict = NULL;
         
         if (sAPState.IsEmpty())
         {
                 pParentDict = pAPDict;
                 pStream = pAPDict->GetStream(sAPType);
         }
         else
         {
                 CPDF_Dictionary* pAPTypeDict = pAPDict->GetDict(sAPType);
                 if (!pAPTypeDict)
                 {
-                        pAPTypeDict = FX_NEW CPDF_Dictionary;
+                        pAPTypeDict = new CPDF_Dictionary;
                         pAPDict->SetAt(sAPType, pAPTypeDict);
                 }
                 
                 pParentDict = pAPTypeDict;
                 pStream = pAPTypeDict->GetStream(sAPState);
         }
         
-        if (!pStream) 
+        if (!pStream)
         {
-                ASSERT(m_pPageView != NULL);
                 CPDF_Document* pDoc = m_pPageView->GetPDFDocument();
-                ASSERT(pDoc != NULL);
-                
-                pStream = FX_NEW CPDF_Stream(NULL, 0, NULL);
+                pStream = new CPDF_Stream(NULL, 0, NULL);
                 FX_INT32 objnum = pDoc->AddIndirectObject(pStream);
-                //pAPDict->SetAtReference(sAPType, pDoc, objnum);
-                ASSERT(pParentDict != NULL);
                 pParentDict->SetAtReference(sAPType, pDoc, objnum);
         }
-        
-        CPDF_Dictionary * pStreamDict = pStream->GetDict();
-        
+
+        CPDF_Dictionary *pStreamDict = pStream->GetDict();
         if (!pStreamDict)
         {
-                pStreamDict = FX_NEW CPDF_Dictionary;
+                pStreamDict = new CPDF_Dictionary;
                 pStreamDict->SetAtName("Type", "XObject");
                 pStreamDict->SetAtName("Subtype", "Form");
                 pStreamDict->SetAtInteger("FormType", 1);
                 pStream->InitStream(NULL,0,pStreamDict);
         }
         
         if (pStreamDict)
         {
                 pStreamDict->SetAtMatrix("Matrix",matrix);      
                 pStreamDict->SetAtRect("BBox", rcBBox);         
@@ skipping 94 matching lines @@
         return ;
 }
 
 CPDF_Page* CPDFSDK_Annot::GetPDFPage()
 {
         if(m_pPageView)
                 return m_pPageView->GetPDFPage();
         return NULL;
 }