Clean up some nits in pdfium_test.cc.

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 <list>
 #include <sstream>
 #include <string>
 #include <utility>
 #include <vector>
 
 #if defined PDF_ENABLE_SKIA && !defined _SKIA_SUPPORT_
 #define _SKIA_SUPPORT_
 #endif
 
 #include "public/fpdf_dataavail.h"
@@ skipping 67 matching lines @@
   out_len *= 3;
 
   char filename[256];
   snprintf(filename, sizeof(filename), "%s.%d.ppm", pdf_name, num);
   FILE* fp = fopen(filename, "wb");
   if (!fp)
     return;
   fprintf(fp, "P6\n# PDF test render\n%d %d\n255\n", width, height);
   // Source data is B, G, R, unused.
   // Dest data is R, G, B.
-  char* result = new char[out_len];
+  std::vector<char> result(out_len);
   for (int h = 0; h < height; ++h) {
     const char* src_line = buffer + (stride * h);
-    char* dest_line = result + (width * h * 3);
+    char* dest_line = result.data() + (width * h * 3);
     for (int w = 0; w < width; ++w) {
       // R
       dest_line[w * 3] = src_line[(w * 4) + 2];
       // G
       dest_line[(w * 3) + 1] = src_line[(w * 4) + 1];
       // B
       dest_line[(w * 3) + 2] = src_line[w * 4];
     }
   }
-  fwrite(result, out_len, 1, fp);
-  delete[] result;
+  fwrite(result.data(), out_len, 1, fp);
   fclose(fp);
 }
 
 void WriteText(FPDF_PAGE page, const char* pdf_name, int num) {
   char filename[256];
   int chars_formatted =
       snprintf(filename, sizeof(filename), "%s.%d.txt", pdf_name, num);
   if (chars_formatted < 0 ||
       static_cast<size_t>(chars_formatted) >= sizeof(filename)) {
     fprintf(stderr, "Filename %s is too long\n", filename);
@@ skipping 232 matching lines @@
       feature = "Screen";
       break;
     case FPDF_UNSP_ANNOT_SIG:
       feature = "Digital_Signature";
       break;
   }
   printf("Unsupported feature: %s.\n", feature.c_str());
 }
 
 bool ParseCommandLine(const std::vector<std::string>& args,
-                      Options* options, std::list<std::string>* files) {
-  if (args.empty()) {
+                      Options* options,
+                      std::vector<std::string>* files) {
+  if (args.empty())
     return false;
-  }
+
   options->exe_path = args[0];
   size_t cur_idx = 1;
   for (; cur_idx < args.size(); ++cur_idx) {
     const std::string& cur_arg = args[cur_idx];
     if (cur_arg == "--show-config") {
       options->show_config = true;
     } else if (cur_arg == "--send-events") {
       options->send_events = true;
     } else if (cur_arg == "--ppm") {
       if (options->output_format != OUTPUT_NONE) {
@@ skipping 61 matching lines @@
         return false;
       }
       options->scale_factor_as_string = cur_arg.substr(8);
     } else if (cur_arg.size() >= 2 && cur_arg[0] == '-' && cur_arg[1] == '-') {
       fprintf(stderr, "Unrecognized argument %s\n", cur_arg.c_str());
       return false;
     } else {
       break;
     }
   }
-  for (size_t i = cur_idx; i < args.size(); i++) {
+  for (size_t i = cur_idx; i < args.size(); i++)
     files->push_back(args[i]);
-  }
+
   return true;
 }
 
 FPDF_BOOL Is_Data_Avail(FX_FILEAVAIL* pThis, size_t offset, size_t size) {
   return true;
 }
 
 void Add_Segment(FX_DOWNLOADHINTS* pThis, size_t offset, size_t size) {
 }
 
@@ skipping 58 matching lines @@
   }
 }
 
 bool RenderPage(const std::string& name,
                 const FPDF_DOCUMENT& doc,
                 const FPDF_FORMHANDLE& form,
                 const int page_index,
                 const Options& options,
                 const std::string& events) {
   FPDF_PAGE page = FPDF_LoadPage(doc, page_index);
-  if (!page) {
+  if (!page)
     return false;
-  }
+
   FPDF_TEXTPAGE text_page = FPDFText_LoadPage(page);
   FORM_OnAfterLoadPage(page, form);
   FORM_DoPageAAction(page, form, FPDFPAGE_AACTION_OPEN);
 
   if (options.send_events)
     SendPageEvents(form, page, events);
 
   double scale = 1.0;
-  if (!options.scale_factor_as_string.empty()) {
+  if (!options.scale_factor_as_string.empty())
     std::stringstream(options.scale_factor_as_string) >> scale;
-  }
+
   int width = static_cast<int>(FPDF_GetPageWidth(page) * scale);
   int height = static_cast<int>(FPDF_GetPageHeight(page) * scale);
   int alpha = FPDFPage_HasTransparency(page) ? 1 : 0;
   FPDF_BITMAP bitmap = FPDFBitmap_Create(width, height, alpha);
   if (bitmap) {
     FPDF_DWORD fill_color = alpha ? 0x00000000 : 0xFFFFFFFF;
     FPDFBitmap_FillRect(bitmap, 0, 0, width, height, fill_color);
     FPDF_RenderPageBitmap(bitmap, page, 0, 0, width, height, 0, 0);
 
     FPDF_FFLDraw(form, bitmap, page, 0, 0, width, height, 0, 0);
@@ skipping 86 matching lines @@
   hints.AddSegment = Add_Segment;
 
   FPDF_DOCUMENT doc;
   int nRet = PDF_DATA_NOTAVAIL;
   bool bIsLinearized = false;
   FPDF_AVAIL pdf_avail = FPDFAvail_Create(&file_avail, &file_access);
 
   if (FPDFAvail_IsLinearized(pdf_avail) == PDF_LINEARIZED) {
     doc = FPDFAvail_GetDocument(pdf_avail, nullptr);
     if (doc) {
-      while (nRet == PDF_DATA_NOTAVAIL) {
+      while (nRet == PDF_DATA_NOTAVAIL)
         nRet = FPDFAvail_IsDocAvail(pdf_avail, &hints);
-      }
+
       if (nRet == PDF_DATA_ERROR) {
         fprintf(stderr, "Unknown error in checking if doc was available.\n");
         return;
       }
       nRet = FPDFAvail_IsFormAvail(pdf_avail, &hints);
       if (nRet == PDF_FORM_ERROR || nRet == PDF_FORM_NOTAVAIL) {
         fprintf(stderr,
                 "Error %d was returned in checking if form was available.\n",
                 nRet);
         return;
@@ skipping 53 matching lines @@
 
   FORM_DoDocumentJSAction(form);
   FORM_DoDocumentOpenAction(form);
 
   int page_count = FPDF_GetPageCount(doc);
   int rendered_pages = 0;
   int bad_pages = 0;
   for (int i = 0; i < page_count; ++i) {
     if (bIsLinearized) {
       nRet = PDF_DATA_NOTAVAIL;
-      while (nRet == PDF_DATA_NOTAVAIL) {
+      while (nRet == PDF_DATA_NOTAVAIL)
         nRet = FPDFAvail_IsPageAvail(pdf_avail, i, &hints);
-      }
+
       if (nRet == PDF_DATA_ERROR) {
         fprintf(stderr, "Unknown error in checking if page %d is available.\n",
                 i);
         return;
       }
     }
-    if (RenderPage(name, doc, form, i, options, events)) {
+    if (RenderPage(name, doc, form, i, options, events))
       ++rendered_pages;
-    } else {
+    else
       ++bad_pages;
-    }
   }
 
   FORM_DoDocumentAAction(form, FPDFDOC_AACTION_WC);
 
 #ifdef PDF_ENABLE_XFA
   // Note: The shut down order here is the reverse of the non-XFA branch order.
   // Need to work out if this is required, and if it is, the lifetimes of
   // objects owned by |doc| that |form| reference.
   FPDF_CloseDocument(doc);
   FPDFDOC_ExitFormFillEnvironment(form);
@@ skipping 23 matching lines @@
   maybe_comma = ",";
 #endif  // V8_USE_EXTERNAL_STARTUP_DATA
 #ifdef PDF_ENABLE_XFA
   config.append(maybe_comma);
   config.append("XFA");
   maybe_comma = ",";
 #endif  // PDF_ENABLE_XFA
   printf("%s\n", config.c_str());
 }
 
-static const char usage_string[] =
+static const char kUsageString[] =
     "Usage: pdfium_test [OPTION] [FILE]...\n"
     "  --show-config     - print build options and exit\n"
     "  --send-events     - send input described by .evt file\n"
     "  --bin-dir=<path>  - override path to v8 external data\n"
     "  --font-dir=<path> - override path to external fonts\n"
     "  --scale=<number>  - scale output size by number (e.g. 0.5)\n"
-    "  --txt - write page text in UTF32-LE <pdf-name>.<page-number>.txt\n"
 #ifdef _WIN32
     "  --bmp - write page images <pdf-name>.<page-number>.bmp\n"
     "  --emf - write page meta files <pdf-name>.<page-number>.emf\n"
 #endif  // _WIN32
+    "  --txt - write page text in UTF32-LE <pdf-name>.<page-number>.txt\n"
     "  --png - write page images <pdf-name>.<page-number>.png\n"
+    "  --ppm - write page images <pdf-name>.<page-number>.ppm\n"
 #ifdef PDF_ENABLE_SKIA
     "  --skp - write page images <pdf-name>.<page-number>.skp\n"
 #endif
     "";
 
 int main(int argc, const char* argv[]) {
   std::vector<std::string> args(argv, argv + argc);
   Options options;
-  std::list<std::string> files;
+  std::vector<std::string> files;
   if (!ParseCommandLine(args, &options, &files)) {
-    fprintf(stderr, "%s", usage_string);
+    fprintf(stderr, "%s", kUsageString);
     return 1;
   }
 
   if (options.show_config) {
     ShowConfig();
     return 0;
   }
 
   if (files.empty()) {
     fprintf(stderr, "No input files.\n");
@@ skipping 26 matching lines @@
   }
   FPDF_InitLibraryWithConfig(&config);
 
   UNSUPPORT_INFO unsuppored_info;
   memset(&unsuppored_info, '\0', sizeof(unsuppored_info));
   unsuppored_info.version = 1;
   unsuppored_info.FSDK_UnSupport_Handler = ExampleUnsupportedHandler;
 
   FSDK_SetUnSpObjProcessHandler(&unsuppored_info);
 
-  while (!files.empty()) {
-    std::string filename = files.front();
-    files.pop_front();
+  for (const std::string& filename : files) {
     size_t file_length = 0;
     std::unique_ptr<char, pdfium::FreeDeleter> file_contents =
         GetFileContents(filename.c_str(), &file_length);
     if (!file_contents)
       continue;
     fprintf(stderr, "Rendering PDF file %s.\n", filename.c_str());
     std::string events;
     if (options.send_events) {
       std::string event_filename = filename;
       size_t event_length = 0;
@@ skipping 17 matching lines @@
   delete platform;
 
 #ifdef V8_USE_EXTERNAL_STARTUP_DATA
   free(const_cast<char*>(natives.data));
   free(const_cast<char*>(snapshot.data));
 #endif  // V8_USE_EXTERNAL_STARTUP_DATA
 #endif  // PDF_ENABLE_V8
 
   return 0;
 }