Fixes for re-enabling more MSVC level 4 warnings: pdfium/ edition (try 2)

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/fpdfview.h"
 #include "../include/fsdk_rendercontext.h"
 #include "../include/fpdf_progressive.h"
@@ skipping 707 matching lines @@
                         fx_format = FXDIB_Argb;
                         break;
                 default:
                         return NULL;
         }
         CFX_DIBitmap* pBitmap = FX_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, 
-                                                                        int red, int green, int blue, int alpha)
+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
         CFX_FxgeDevice device;
 #endif
         device.Attach((CFX_DIBitmap*)bitmap);
-        if (!((CFX_DIBitmap*)bitmap)->HasAlpha()) alpha = 255;
+        if (!((CFX_DIBitmap*)bitmap)->HasAlpha()) color |= 0xFF000000;
         FX_RECT rect(left, top, left+width, top+height);
-        device.FillRect(&rect, FXARGB_MAKE(alpha, red, green, blue));
+        device.FillRect(&rect, color);
 }
 
 DLLEXPORT void* STDCALL FPDFBitmap_GetBuffer(FPDF_BITMAP bitmap)
 {
         if (bitmap == NULL) return NULL;
         return ((CFX_DIBitmap*)bitmap)->GetBuffer();
 }
 
 DLLEXPORT int STDCALL FPDFBitmap_GetWidth(FPDF_BITMAP bitmap)
 {
@@ skipping 113 matching lines @@
 {
         if (document == NULL)
                 return NULL;
         if (name == NULL || name[0] == 0) 
                 return NULL;
 
         CPDF_Document* pDoc = (CPDF_Document*)document;
         CPDF_NameTree name_tree(pDoc, FX_BSTRC("Dests"));
         return name_tree.LookupNamedDest(pDoc, name);
 }