Better error from pdfium_test when page too big to render.

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"
 #include "../include/fpdf_progressive.h"
 #include "../include/fpdf_ext.h"
 #include "../../../core/src/fxcrt/fx_safe_types.h"
 #include "../../third_party/base/numerics/safe_conversions_impl.h"
+#include "../../third_party/base/nonstd_unique_ptr.h"

[Lei Zhang, 2015/05/08 18:05:15]

nit: alphabetical order.

[Tom Sepez, 2015/05/08 18:13:01]

Done.

 
 CPDF_CustomAccess::CPDF_CustomAccess(FPDF_FILEACCESS* pFileAccess)
 {
         if (pFileAccess)
                 m_FileAccess = *pFileAccess;
 }
 
 FX_BOOL CPDF_CustomAccess::ReadBlock(void* buffer, FX_FILESIZE offset, size_t size)
 {
     if (offset < 0) {
@@ skipping 565 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 = new CFX_DIBitmap;
-        pBitmap->Create(width, height, alpha ? FXDIB_Argb : FXDIB_Rgb32);
-        return pBitmap;
+        nonstd::unique_ptr<CFX_DIBitmap> pBitmap(new CFX_DIBitmap);

[Lei Zhang, 2015/05/08 18:05:15]

nit: Can we get rid of tabs in this entire function?

[Tom Sepez, 2015/05/08 18:13:01]

Yes.  The only thing worse than tabs in files are people who think its okay to
have tabs in files (because you'll spend the rest of your life futily arguing
with them rather than doing work).

+        if (!pBitmap->Create(width, height, alpha ? FXDIB_Argb : FXDIB_Rgb32)) {
+                return NULL;
+        }
+        return pBitmap.release();
 }
 
 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:
@@ skipping 251 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;
 }