Replace FX_NEW with new, remove tests from fpdfsdk

fpdfsdk/src/fpdf_transformpage.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_transformpage.h"
 
 DLLEXPORT void STDCALL FPDFPage_SetMediaBox(FPDF_PAGE page, float left, float bottom, float right, float top)
 {
         if(!page)
                 return;
+
         CPDF_Page* pPage = (CPDF_Page*)page;
         CPDF_Dictionary* pPageDict = pPage->m_pFormDict;
-        CPDF_Array* pMediaBoxArray = FX_NEW CPDF_Array;
-        pMediaBoxArray->Add(FX_NEW CPDF_Number(left));
-        pMediaBoxArray->Add(FX_NEW CPDF_Number(bottom));
-        pMediaBoxArray->Add(FX_NEW CPDF_Number(FX_FLOAT(right)));
-        pMediaBoxArray->Add(FX_NEW CPDF_Number(FX_FLOAT(top)));
-        
+        CPDF_Array* pMediaBoxArray = new CPDF_Array;
+        pMediaBoxArray->Add(new CPDF_Number(left));
+        pMediaBoxArray->Add(new CPDF_Number(bottom));
+        pMediaBoxArray->Add(new CPDF_Number(FX_FLOAT(right)));
+        pMediaBoxArray->Add(new CPDF_Number(FX_FLOAT(top)));
         pPageDict->SetAt("MediaBox", pMediaBoxArray);
 }
 
 
 DLLEXPORT void STDCALL FPDFPage_SetCropBox(FPDF_PAGE page, float left, float bottom, float right, float top)
 {
         if(!page)
                 return;
+
         CPDF_Page* pPage = (CPDF_Page*)page;
         CPDF_Dictionary* pPageDict = pPage->m_pFormDict;
-        CPDF_Array* pCropBoxArray = FX_NEW CPDF_Array;
-        pCropBoxArray->Add(FX_NEW CPDF_Number(left));
-        pCropBoxArray->Add(FX_NEW CPDF_Number(bottom));
-        pCropBoxArray->Add(FX_NEW CPDF_Number(FX_FLOAT(right)));
-        pCropBoxArray->Add(FX_NEW CPDF_Number(FX_FLOAT(top)));
-        
-        
+        CPDF_Array* pCropBoxArray = new CPDF_Array;
+        pCropBoxArray->Add(new CPDF_Number(left));
+        pCropBoxArray->Add(new CPDF_Number(bottom));
+        pCropBoxArray->Add(new CPDF_Number(FX_FLOAT(right)));
+        pCropBoxArray->Add(new CPDF_Number(FX_FLOAT(top)));
         pPageDict->SetAt("CropBox", pCropBoxArray);
 }
 
 
 DLLEXPORT FX_BOOL STDCALL FPDFPage_GetMediaBox(FPDF_PAGE page, float* left, float* bottom, float* right, float* top)
 {
         if(!page)
                 return FALSE;
         CPDF_Page* pPage = (CPDF_Page*)page;
         CPDF_Dictionary* pPageDict = pPage->m_pFormDict;
@@ skipping 46 matching lines @@
         
 
         CPDF_Page* pPage = (CPDF_Page*)page;
         CPDF_Dictionary* pPageDic = pPage->m_pFormDict;
         CPDF_Object* pContentObj = pPageDic ? pPageDic->GetElement("Contents") : NULL;
         if(!pContentObj)
                 pContentObj = pPageDic ? pPageDic->GetArray("Contents") : NULL;
         if(!pContentObj)
                 return FALSE;
         
-        CPDF_Dictionary* pDic = FX_NEW CPDF_Dictionary;
-        CPDF_Stream* pStream = FX_NEW CPDF_Stream(NULL,0, pDic);
+        CPDF_Dictionary* pDic = new CPDF_Dictionary;
+        CPDF_Stream* pStream = new CPDF_Stream(NULL,0, pDic);
         pStream->SetData(textBuf.GetBuffer(), textBuf.GetSize(), FALSE, FALSE);
         CPDF_Document* pDoc = pPage->m_pDocument;
         if(!pDoc)
                 return FALSE;
         pDoc->AddIndirectObject(pStream);
 
-        pDic = FX_NEW CPDF_Dictionary;
-        CPDF_Stream* pEndStream = FX_NEW CPDF_Stream(NULL,0, pDic);
+        pDic = new CPDF_Dictionary;
+        CPDF_Stream* pEndStream = new CPDF_Stream(NULL,0, pDic);
         pEndStream->SetData((FX_LPCBYTE)" Q", 2, FALSE, FALSE);
         pDoc->AddIndirectObject(pEndStream);
         
         CPDF_Array* pContentArray = NULL;
         if (pContentObj && pContentObj->GetType() == PDFOBJ_ARRAY)
         {
                 pContentArray = (CPDF_Array*)pContentObj;
-                CPDF_Reference* pRef = FX_NEW CPDF_Reference(pDoc, pStream->GetObjNum());
+                CPDF_Reference* pRef = new CPDF_Reference(pDoc, pStream->GetObjNum());
                 pContentArray->InsertAt(0, pRef);
                 pContentArray->AddReference(pDoc,pEndStream);
                 
         }
         else if(pContentObj && pContentObj->GetType() == PDFOBJ_REFERENCE)
         {
                 CPDF_Reference* pReference = (CPDF_Reference*)pContentObj;
                 CPDF_Object* pDirectObj = pReference->GetDirect();
                 if(pDirectObj != NULL)
                 {
                         if(pDirectObj->GetType() == PDFOBJ_ARRAY)
                         {
                                 pContentArray = (CPDF_Array*)pDirectObj;
-                                CPDF_Reference* pRef = FX_NEW CPDF_Reference(pDoc, pStream->GetObjNum());
+                                CPDF_Reference* pRef = new CPDF_Reference(pDoc, pStream->GetObjNum());
                                 pContentArray->InsertAt(0, pRef);
                                 pContentArray->AddReference(pDoc,pEndStream);
-                                
                         }
                         else if(pDirectObj->GetType() == PDFOBJ_STREAM)
                         {
-                                pContentArray = FX_NEW CPDF_Array();
+                                pContentArray = new CPDF_Array();
                                 pContentArray->AddReference(pDoc,pStream->GetObjNum());
                                 pContentArray->AddReference(pDoc,pDirectObj->GetObjNum());
                                 pContentArray->AddReference(pDoc, pEndStream);
                                 pPageDic->SetAtReference("Contents", pDoc, pDoc->AddIndirectObject(pContentArray));
                         }
                 }
-        }       
+        }
 
         //Need to transform the patterns as well.
         CPDF_Dictionary* pRes = pPageDic->GetDict(FX_BSTRC("Resources"));
         if(pRes)
         {
                 CPDF_Dictionary* pPattenDict = pRes->GetDict(FX_BSTRC("Pattern"));
                 if(pPattenDict)
                 {
                         FX_POSITION pos = pPattenDict->GetStartPos();
                         while(pos)
@@ skipping 34 matching lines @@
         
         //Special treatment to shading object, because the ClipPath for shading object is already transformed.
         if(pPageObj->m_Type != PDFPAGE_SHADING)
                 pPageObj->TransformClipPath(matrix);
         pPageObj->TransformGeneralState(matrix);
 }
 
 
 DLLEXPORT FPDF_CLIPPATH STDCALL FPDF_CreateClipPath(float left, float bottom, float right, float top)
 {
-        CPDF_ClipPath* pNewClipPath =  FX_NEW CPDF_ClipPath();
+        CPDF_ClipPath* pNewClipPath = new CPDF_ClipPath();
         pNewClipPath->GetModify();
         CPDF_Path Path;
         Path.GetModify();
         Path.AppendRect(left, bottom, right, top);
         pNewClipPath->AppendPath(Path, FXFILL_ALTERNATE, FALSE);
         return pNewClipPath;
 }
 
 DLLEXPORT void STDCALL FPDF_DestroyClipPath(FPDF_CLIPPATH clipPath)
 {
@@ skipping 60 matching lines @@
                         // Empty clipping (totally clipped out)
                         strClip << "0 0 m W n ";
                 } else {
                         OutputPath(strClip, path);
                         if (iClipType == FXFILL_WINDING)
                                 strClip << "W n\n";
                         else
                                 strClip << "W* n\n";
                 }
         }
-        CPDF_Dictionary* pDic = FX_NEW CPDF_Dictionary;
-        CPDF_Stream* pStream = FX_NEW CPDF_Stream(NULL,0, pDic);
+        CPDF_Dictionary* pDic = new CPDF_Dictionary;
+        CPDF_Stream* pStream = new CPDF_Stream(NULL,0, pDic);
         pStream->SetData(strClip.GetBuffer(), strClip.GetSize(), FALSE, FALSE);
         CPDF_Document* pDoc = pPage->m_pDocument;
         if(!pDoc)
                 return;
         pDoc->AddIndirectObject(pStream);
         
         CPDF_Array* pContentArray = NULL;
         if (pContentObj && pContentObj->GetType() == PDFOBJ_ARRAY)
         {
                 pContentArray = (CPDF_Array*)pContentObj;
-                CPDF_Reference* pRef = FX_NEW CPDF_Reference(pDoc, pStream->GetObjNum());
+                CPDF_Reference* pRef = new CPDF_Reference(pDoc, pStream->GetObjNum());
                 pContentArray->InsertAt(0, pRef);
-                
         }
         else if(pContentObj && pContentObj->GetType() == PDFOBJ_REFERENCE)
         {
                 CPDF_Reference* pReference = (CPDF_Reference*)pContentObj;
                 CPDF_Object* pDirectObj = pReference->GetDirect();
                 if(pDirectObj != NULL)
                 {
                         if(pDirectObj->GetType() == PDFOBJ_ARRAY)
                         {
                                 pContentArray = (CPDF_Array*)pDirectObj;
-                                CPDF_Reference* pRef = FX_NEW CPDF_Reference(pDoc, pStream->GetObjNum());
+                                CPDF_Reference* pRef = new CPDF_Reference(pDoc, pStream->GetObjNum());
                                 pContentArray->InsertAt(0, pRef);
-                                
                         }
                         else if(pDirectObj->GetType() == PDFOBJ_STREAM)
                         {
-                                pContentArray = FX_NEW CPDF_Array();
+                                pContentArray = new CPDF_Array();
                                 pContentArray->AddReference(pDoc,pStream->GetObjNum());
                                 pContentArray->AddReference(pDoc,pDirectObj->GetObjNum());
                                 pPageDic->SetAtReference("Contents", pDoc, pDoc->AddIndirectObject(pContentArray));
                         }
                 }
-        }       
+        }
 }