Replace FX_NEW with new, remove tests from fpdfsdk

fpdfsdk/src/fpdfview.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/fpdfview.h"
 #include "../include/fsdk_rendercontext.h"
@@ skipping 166 matching lines @@
         SetLastError(err_code);
 }
 
 DLLEXPORT void  STDCALL FPDF_SetSandBoxPolicy(FPDF_DWORD policy, FPDF_BOOL enable)
 {
         return FSDK_SetSandBoxPolicy(policy, enable);
 }
 
 DLLEXPORT FPDF_DOCUMENT STDCALL FPDF_LoadDocument(FPDF_STRING file_path, FPDF_BYTESTRING password)
 {
-        CPDF_Parser* pParser = FX_NEW CPDF_Parser;
+        CPDF_Parser* pParser = new CPDF_Parser;
         pParser->SetPassword(password);
 
         FX_DWORD err_code = pParser->StartParse((FX_LPCSTR)file_path);
         if (err_code) {
                 delete pParser;
                 ProcessParseError(err_code);
                 return NULL;
         }
         return pParser->GetDocument();
 }
@@ skipping 19 matching lines @@
             }
             FXSYS_memcpy(buffer, m_pBuf+offset, size);
             return TRUE;
         }
 private:
         FX_BYTE* m_pBuf;
         FX_FILESIZE m_size;
 };
 DLLEXPORT FPDF_DOCUMENT STDCALL FPDF_LoadMemDocument(const void* data_buf, int size, FPDF_BYTESTRING password)
 {
-        CPDF_Parser* pParser = FX_NEW CPDF_Parser;
+        CPDF_Parser* pParser = new CPDF_Parser;
         pParser->SetPassword(password);
-        CMemFile* pMemFile = FX_NEW CMemFile((FX_BYTE*)data_buf, size);
+        CMemFile* pMemFile = new CMemFile((FX_BYTE*)data_buf, size);
         FX_DWORD err_code = pParser->StartParse(pMemFile);
         if (err_code) {
                 delete pParser;
                 ProcessParseError(err_code);
                 return NULL;
         }
         CPDF_Document * pDoc = NULL;
         pDoc = pParser?pParser->GetDocument():NULL;
         CheckUnSupportError(pDoc, err_code);
         return pParser->GetDocument();
 }
 
 DLLEXPORT FPDF_DOCUMENT STDCALL FPDF_LoadCustomDocument(FPDF_FILEACCESS* pFileAccess, FPDF_BYTESTRING password)
 {
-        CPDF_Parser* pParser = FX_NEW CPDF_Parser;
+        CPDF_Parser* pParser = new CPDF_Parser;
         pParser->SetPassword(password);
-        CPDF_CustomAccess* pFile = FX_NEW CPDF_CustomAccess(pFileAccess);
+        CPDF_CustomAccess* pFile = new CPDF_CustomAccess(pFileAccess);
         FX_DWORD err_code = pParser->StartParse(pFile);
         if (err_code) {
                 delete pParser;
                 ProcessParseError(err_code);
                 return NULL;
         }
         CPDF_Document * pDoc = NULL;
         pDoc = pParser?pParser->GetDocument():NULL;
         CheckUnSupportError(pDoc, err_code);
         return pParser->GetDocument();
@@ skipping 37 matching lines @@
 DLLEXPORT int STDCALL FPDF_GetPageCount(FPDF_DOCUMENT document)
 {
         if (document == NULL) return 0;
         return ((CPDF_Document*)document)->GetPageCount();
 }
 
 DLLEXPORT FPDF_PAGE STDCALL FPDF_LoadPage(FPDF_DOCUMENT document, int page_index)
 {
         if (document == NULL) return NULL;
         if (page_index < 0 || page_index >= FPDF_GetPageCount(document)) return NULL;
-//      CPDF_Parser* pParser = (CPDF_Parser*)document;
+
         CPDF_Document* pDoc = (CPDF_Document*)document;
         if (pDoc == NULL) return NULL;
         CPDF_Dictionary* pDict = pDoc->GetPage(page_index);
         if (pDict == NULL) return NULL;
-        CPDF_Page* pPage = FX_NEW CPDF_Page;
+        CPDF_Page* pPage = new CPDF_Page;
         pPage->Load(pDoc, pDict);
         pPage->ParseContent();
-        
-//      CheckUnSupportError(pDoc, 0);
-
         return pPage;
 }
 
 DLLEXPORT double STDCALL FPDF_GetPageWidth(FPDF_PAGE page)
 {
         if (!page)
                 return 0.0;
         return ((CPDF_Page*)page)->GetPageWidth();
 }
 
@@ skipping 17 matching lines @@
 #define DEBUG_TRACE
 #endif
 
 #if defined(_WIN32)
 DLLEXPORT void STDCALL FPDF_RenderPage(HDC dc, FPDF_PAGE page, int start_x, int start_y, int size_x, int size_y,
                                                 int rotate, int flags)
 {
         if (page==NULL) return;
         CPDF_Page* pPage = (CPDF_Page*)page;
 
-        CRenderContext* pContext = FX_NEW CRenderContext;
+        CRenderContext* pContext = new CRenderContext;
         pPage->SetPrivateData((void*)1, pContext, DropContext);
 
 #ifndef _WIN32_WCE
         CFX_DIBitmap* pBitmap = NULL;
         FX_BOOL bBackgroundAlphaNeeded=FALSE;
         bBackgroundAlphaNeeded = pPage->BackgroundAlphaNeeded();
         if (bBackgroundAlphaNeeded)
         {
                 
-                pBitmap = FX_NEW CFX_DIBitmap;
+                pBitmap = new CFX_DIBitmap;
                 pBitmap->Create(size_x, size_y, FXDIB_Argb);
                 pBitmap->Clear(0x00ffffff);
 #ifdef _SKIA_SUPPORT_
-                pContext->m_pDevice = FX_NEW CFX_SkiaDevice;
+                pContext->m_pDevice = new CFX_SkiaDevice;
                 ((CFX_SkiaDevice*)pContext->m_pDevice)->Attach((CFX_DIBitmap*)pBitmap);
 #else
-                pContext->m_pDevice = FX_NEW CFX_FxgeDevice;
+                pContext->m_pDevice = new CFX_FxgeDevice;
                 ((CFX_FxgeDevice*)pContext->m_pDevice)->Attach((CFX_DIBitmap*)pBitmap);
 #endif
         }
         else
-            pContext->m_pDevice = FX_NEW CFX_WindowsDevice(dc);
+            pContext->m_pDevice = new CFX_WindowsDevice(dc);
 
         Func_RenderPage(pContext, page, start_x, start_y, size_x, size_y, rotate, flags,TRUE,NULL);
 
         if (bBackgroundAlphaNeeded) 
         {
                 if (pBitmap)
                 {
                         CFX_WindowsDevice WinDC(dc);
                         
                         if (WinDC.GetDeviceCaps(FXDC_DEVICE_CLASS) == FXDC_PRINTER)
                         {
-                                CFX_DIBitmap* pDst = FX_NEW CFX_DIBitmap;
+                                CFX_DIBitmap* pDst = new CFX_DIBitmap;
                                 int pitch = pBitmap->GetPitch();
                                 pDst->Create(size_x, size_y, FXDIB_Rgb32);
                                 FXSYS_memset(pDst->GetBuffer(), -1, pitch*size_y);
                                 pDst->CompositeBitmap(0, 0, size_x, size_y, pBitmap, 0, 0, FXDIB_BLEND_NORMAL, NULL, FALSE, NULL);
                                 WinDC.StretchDIBits(pDst,0,0,size_x,size_y);
                                 delete pDst;
                         }
                         else
                                 WinDC.SetDIBits(pBitmap,0,0);
 
@@ skipping 42 matching lines @@
         }
         FXSYS_memset(pBuffer, 0xff, height*((width*3+3)/4*4));
 
 #ifdef DEBUG_TRACE
         {
                 CPDF_ModuleMgr::Get()->ReportError(999, "DIBSection created");
         }
 #endif
 
         // Create a device with this external buffer
-        pContext->m_pBitmap = FX_NEW CFX_DIBitmap;
+        pContext->m_pBitmap = new CFX_DIBitmap;
         pContext->m_pBitmap->Create(width, height, FXDIB_Rgb, (FX_LPBYTE)pBuffer);
-        pContext->m_pDevice = FX_NEW CPDF_FxgeDevice;
+        pContext->m_pDevice = new CPDF_FxgeDevice;
         ((CPDF_FxgeDevice*)pContext->m_pDevice)->Attach(pContext->m_pBitmap);
-        
+
 #ifdef DEBUG_TRACE
         CPDF_ModuleMgr::Get()->ReportError(999, "Ready for PDF rendering");
 #endif
 
         // output to bitmap device
         Func_RenderPage(pContext, page, start_x - rect.left, start_y - rect.top, size_x, size_y, rotate, flags);
 
 #ifdef DEBUG_TRACE
         CPDF_ModuleMgr::Get()->ReportError(999, "Finished PDF rendering");
 #endif
@@ skipping 37 matching lines @@
 }
 #endif
 
 DLLEXPORT void STDCALL FPDF_RenderPageBitmap(FPDF_BITMAP bitmap, FPDF_PAGE page, int start_x, int start_y, 
                                                 int size_x, int size_y, int rotate, int flags)
 {
         if (bitmap == NULL || page == NULL) return;
         CPDF_Page* pPage = (CPDF_Page*)page;
 
 
-        CRenderContext* pContext = FX_NEW CRenderContext;
+        CRenderContext* pContext = new CRenderContext;
         pPage->SetPrivateData((void*)1, pContext, DropContext);
 #ifdef _SKIA_SUPPORT_
-        pContext->m_pDevice = FX_NEW CFX_SkiaDevice;
+        pContext->m_pDevice = new CFX_SkiaDevice;
 
         if (flags & FPDF_REVERSE_BYTE_ORDER)
                 ((CFX_SkiaDevice*)pContext->m_pDevice)->Attach((CFX_DIBitmap*)bitmap,0,TRUE);
         else
                 ((CFX_SkiaDevice*)pContext->m_pDevice)->Attach((CFX_DIBitmap*)bitmap);
 #else
-        pContext->m_pDevice = FX_NEW CFX_FxgeDevice;
+        pContext->m_pDevice = new CFX_FxgeDevice;
 
         if (flags & FPDF_REVERSE_BYTE_ORDER)
                 ((CFX_FxgeDevice*)pContext->m_pDevice)->Attach((CFX_DIBitmap*)bitmap,0,TRUE);
         else
                 ((CFX_FxgeDevice*)pContext->m_pDevice)->Attach((CFX_DIBitmap*)bitmap);
 #endif
 
         Func_RenderPage(pContext, page, start_x, start_y, size_x, size_y, rotate, flags,TRUE,NULL);
 
         delete pContext;
@@ skipping 61 matching lines @@
 
         FX_FLOAT device_x_f, device_y_f;
         page2device.Transform(((FX_FLOAT)page_x), ((FX_FLOAT)page_y), device_x_f, device_y_f);
 
         *device_x = FXSYS_round(device_x_f);
         *device_y = FXSYS_round(device_y_f);
 }
 
 DLLEXPORT FPDF_BITMAP STDCALL FPDFBitmap_Create(int width, int height, int alpha)
 {
-        CFX_DIBitmap* pBitmap = FX_NEW CFX_DIBitmap;
+        CFX_DIBitmap* pBitmap = new CFX_DIBitmap;
         pBitmap->Create(width, height, alpha ? FXDIB_Argb : FXDIB_Rgb32);
         return pBitmap;
 }
 
 DLLEXPORT FPDF_BITMAP STDCALL FPDFBitmap_CreateEx(int width, int height, int format, void* first_scan, int stride)
 {
         FXDIB_Format fx_format;
         switch (format) {
                 case FPDFBitmap_Gray:
                         fx_format = FXDIB_8bppRgb;
                         break;
                 case FPDFBitmap_BGR:
                         fx_format = FXDIB_Rgb;
                         break;
                 case FPDFBitmap_BGRx:
                         fx_format = FXDIB_Rgb32;
                         break;
                 case FPDFBitmap_BGRA:
                         fx_format = FXDIB_Argb;
                         break;
                 default:
                         return NULL;
         }
-        CFX_DIBitmap* pBitmap = FX_NEW CFX_DIBitmap;
+        CFX_DIBitmap* pBitmap = new CFX_DIBitmap;
         pBitmap->Create(width, height, fx_format, (FX_LPBYTE)first_scan, stride);
         return pBitmap;
 }
 
 DLLEXPORT void STDCALL FPDFBitmap_FillRect(FPDF_BITMAP bitmap, int left, int top, int width, int height, FPDF_DWORD color)
 {
         if (bitmap == NULL) return;
 #ifdef _SKIA_SUPPORT_
         CFX_SkiaDevice device;
 #else
@@ skipping 72 matching lines @@
         pPage->GetDisplayMatrix(matrix, start_x, start_y, size_x, size_y, rotate); 
 
         FX_RECT clip;
         clip.left = start_x;
         clip.right = start_x + size_x;
         clip.top = start_y;
         clip.bottom = start_y + size_y;
         pContext->m_pDevice->SaveState();
         pContext->m_pDevice->SetClip_Rect(&clip);
 
-        pContext->m_pContext = FX_NEW CPDF_RenderContext;
+        pContext->m_pContext = new CPDF_RenderContext;
         pContext->m_pContext->Create(pPage);
         pContext->m_pContext->AppendObjectList(pPage, &matrix);
 
         if (flags & FPDF_ANNOT) {
-                pContext->m_pAnnots = FX_NEW CPDF_AnnotList(pPage);
+                pContext->m_pAnnots = new CPDF_AnnotList(pPage);
                 FX_BOOL bPrinting = pContext->m_pDevice->GetDeviceClass() != FXDC_DISPLAY;
                 pContext->m_pAnnots->DisplayAnnots(pPage, pContext->m_pContext, bPrinting, &matrix, TRUE, NULL);
         }
 
-        pContext->m_pRenderer = FX_NEW CPDF_ProgressiveRenderer;
+        pContext->m_pRenderer = new CPDF_ProgressiveRenderer;
         pContext->m_pRenderer->Start(pContext->m_pContext, pContext->m_pDevice, pContext->m_pOptions, pause);
         if (bNeedToRestore)
         {
           pContext->m_pDevice->RestoreState();
         }
-        
-//#endif
 }
 
 DLLEXPORT int STDCALL FPDF_GetPageSizeByIndex(FPDF_DOCUMENT document, int page_index, double* width, double* height)
 {
         CPDF_Document* pDoc = (CPDF_Document*)document;
         if(pDoc == NULL)
                 return FALSE;
 
         CPDF_Dictionary* pDict = pDoc->GetPage(page_index);
         if (pDict == NULL) return FALSE;
@@ skipping 115 matching lines @@
     if (!buffer) {
         buflen = len;
     } else if (buflen >= len) {
         memcpy(buffer, utf16Name.c_str(), len);
         buflen = len;
     } else {
         buflen = -1;
     }
     return (FPDF_DEST)pDestObj;
 }