XFA: merge patch from issue 801913002 and 804463003

samples/pdfium_test.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <wchar.h>
 
@@ skipping 377 matching lines @@
   if (!ParseCommandLine(argc, argv, &format, &files)) {
     printf("Usage: pdfium_test [OPTION] [FILE]...\n");
     printf("--ppm    write page images <pdf-name>.<page-number>.ppm\n");
 #ifdef _WIN32
     printf("--bmp    write page images <pdf-name>.<page-number>.bmp\n");
     printf("--emf    write page meta files <pdf-name>.<page-number>.emf\n");
 #endif
     return 1;
   }
 
-  FPDF_InitLibrary(NULL);
+  FPDF_InitLibrary();
 
   UNSUPPORT_INFO unsuppored_info;
   memset(&unsuppored_info, '\0', sizeof(unsuppored_info));
   unsuppored_info.version = 1;
   unsuppored_info.FSDK_UnSupport_Handler = Unsupported_Handler;
 
   FSDK_SetUnSpObjProcessHandler(&unsuppored_info);
 
   while (!files.empty()) {
     const char* filename = files.front();
@@ skipping 14 matching lines @@
     } else {
       RenderPdf(filename, pBuf, len, format);
     }
     free(pBuf);
   }
 
   FPDF_DestroyLibrary();
 
   return 0;
 }