Remove default arguments from CFX_FxgeDevice.

fpdfsdk/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 "public/fpdfview.h"
 
 #include <memory>
 
@@ skipping 56 matching lines @@
 }
 
 CPDF_Page* CPDFPageFromFPDFPage(FPDF_PAGE page) {
 #ifdef PDF_ENABLE_XFA
   return page ? UnderlyingFromFPDFPage(page)->GetPDFPage() : nullptr;
 #else   // PDF_ENABLE_XFA
   return UnderlyingFromFPDFPage(page);
 #endif  // PDF_ENABLE_XFA
 }
 
+CFX_DIBitmap* CFXBitmapFromFPDFBitmap(FPDF_BITMAP bitmap) {
+  return static_cast<CFX_DIBitmap*>(bitmap);
+}
+
 #ifdef PDF_ENABLE_XFA
 CFPDF_FileStream::CFPDF_FileStream(FPDF_FILEHANDLER* pFS) {
   m_pFS = pFS;
   m_nCurPos = 0;
 }
 
 IFX_FileStream* CFPDF_FileStream::Retain() {
   return this;
 }
 
@@ skipping 450 matching lines @@
   CRenderContext* pContext = new CRenderContext;
   pPage->SetRenderContext(std::unique_ptr<CFX_Deletable>(pContext));
 
   CFX_DIBitmap* pBitmap = nullptr;
   FX_BOOL bBackgroundAlphaNeeded = pPage->BackgroundAlphaNeeded();
   FX_BOOL bHasImageMask = pPage->HasImageMask();
   if (bBackgroundAlphaNeeded || bHasImageMask) {
     pBitmap = new CFX_DIBitmap;
     pBitmap->Create(size_x, size_y, FXDIB_Argb);
     pBitmap->Clear(0x00ffffff);
-    pContext->m_pDevice = new CFX_FxgeDevice;
-    ((CFX_FxgeDevice*)pContext->m_pDevice)->Attach((CFX_DIBitmap*)pBitmap);
+    CFX_FxgeDevice* pDevice = new CFX_FxgeDevice;
+    pContext->m_pDevice = pDevice;
+    pDevice->Attach(pBitmap, false, nullptr, false);
   } else {
     pContext->m_pDevice = new CFX_WindowsDevice(dc);
   }
 
   FPDF_RenderPage_Retail(pContext, page, start_x, start_y, size_x, size_y,
-                         rotate, flags, TRUE, NULL);
+                         rotate, flags, TRUE, nullptr);
 
   if (bBackgroundAlphaNeeded || bHasImageMask) {
     if (pBitmap) {
       CFX_WindowsDevice WinDC(dc);
 
       if (WinDC.GetDeviceCaps(FXDC_DEVICE_CLASS) == FXDC_PRINTER) {
         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);
@@ skipping 23 matching lines @@
                                              int flags) {
   if (!bitmap)
     return;
 
   CPDF_Page* pPage = CPDFPageFromFPDFPage(page);
   if (!pPage)
     return;
 
   CRenderContext* pContext = new CRenderContext;
   pPage->SetRenderContext(std::unique_ptr<CFX_Deletable>(pContext));
-  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);
-  }
+  CFX_FxgeDevice* pDevice = new CFX_FxgeDevice;
+  pContext->m_pDevice = pDevice;
+  CFX_DIBitmap* pBitmap = CFXBitmapFromFPDFBitmap(bitmap);
+  pDevice->Attach(pBitmap, !!(flags & FPDF_REVERSE_BYTE_ORDER), nullptr, false);
 
   FPDF_RenderPage_Retail(pContext, page, start_x, start_y, size_x, size_y,
                          rotate, flags, TRUE, nullptr);
 
   pPage->SetRenderContext(std::unique_ptr<CFX_Deletable>());
 }
 
 #ifdef _SKIA_SUPPORT_
 DLLEXPORT FPDF_RECORDER STDCALL FPDF_RenderPageSkp(FPDF_PAGE page,
                                                    int size_x,
@@ skipping 149 matching lines @@
 }
 
 DLLEXPORT void STDCALL FPDFBitmap_FillRect(FPDF_BITMAP bitmap,
                                            int left,
                                            int top,
                                            int width,
                                            int height,
                                            FPDF_DWORD color) {
   if (!bitmap)
     return;
+
   CFX_FxgeDevice device;
-  device.Attach((CFX_DIBitmap*)bitmap);
-  if (!((CFX_DIBitmap*)bitmap)->HasAlpha())
+  CFX_DIBitmap* pBitmap = CFXBitmapFromFPDFBitmap(bitmap);
+  device.Attach(pBitmap, false, nullptr, false);
+  if (!pBitmap->HasAlpha())
     color |= 0xFF000000;
   FX_RECT rect(left, top, left + width, top + height);
   device.FillRect(&rect, color);
 }
 
 DLLEXPORT void* STDCALL FPDFBitmap_GetBuffer(FPDF_BITMAP bitmap) {
-  return bitmap ? ((CFX_DIBitmap*)bitmap)->GetBuffer() : nullptr;
+  return bitmap ? CFXBitmapFromFPDFBitmap(bitmap)->GetBuffer() : nullptr;
 }
 
 DLLEXPORT int STDCALL FPDFBitmap_GetWidth(FPDF_BITMAP bitmap) {
-  return bitmap ? ((CFX_DIBitmap*)bitmap)->GetWidth() : 0;
+  return bitmap ? CFXBitmapFromFPDFBitmap(bitmap)->GetWidth() : 0;
 }
 
 DLLEXPORT int STDCALL FPDFBitmap_GetHeight(FPDF_BITMAP bitmap) {
-  return bitmap ? ((CFX_DIBitmap*)bitmap)->GetHeight() : 0;
+  return bitmap ? CFXBitmapFromFPDFBitmap(bitmap)->GetHeight() : 0;
 }
 
 DLLEXPORT int STDCALL FPDFBitmap_GetStride(FPDF_BITMAP bitmap) {
-  return bitmap ? ((CFX_DIBitmap*)bitmap)->GetPitch() : 0;
+  return bitmap ? CFXBitmapFromFPDFBitmap(bitmap)->GetPitch() : 0;
 }
 
 DLLEXPORT void STDCALL FPDFBitmap_Destroy(FPDF_BITMAP bitmap) {
-  delete (CFX_DIBitmap*)bitmap;
+  delete CFXBitmapFromFPDFBitmap(bitmap);
 }
 
 void FPDF_RenderPage_Retail(CRenderContext* pContext,
                             FPDF_PAGE page,
                             int start_x,
                             int start_y,
                             int size_x,
                             int size_y,
                             int rotate,
                             int flags,
@@ skipping 284 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;
 }