commit f045cb21c570b9feb65b7e02c54d0b2cf096a513
author Lei Zhang <thestig@chromium.org> Sat Aug 01 01:21:38 2020 +0000
committer Chromium commit bot <commit-bot@chromium.org> Sat Aug 01 01:21:38 2020 +0000
tree 597dbcbd8b9a826306c018d566aa6efbd89fb79c
parent 3b1a8b466ffe471626230349604b3beb73b5b7ac

Remove FPDFText_LoadPage() call in pdfium_test_write_helper.cc.

In pdfium_test_write_helper.cc, WriteText() calls FPDFText_LoadPage() to
get a FPDF_TEXTPAGE, even though its caller already has one. Remove the
FPDFText_LoadPage() call and have the caller pass it in instead.

Change-Id: I3fbc74eb0083afdb4d0f3b8228b5ee957d2858ea
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/72296
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>

samples/pdfium_test.cc

diff --git a/samples/pdfium_test.cc b/samples/pdfium_test.cc
index b09c9a8..2011f8a 100644
--- a/samples/pdfium_test.cc
+++ b/samples/pdfium_test.cc
@@ -815,7 +815,7 @@
         break;
 #endif
       case OutputFormat::kText:
-        WriteText(page, name.c_str(), page_index);
+        WriteText(text_page.get(), name.c_str(), page_index);
         break;
 
       case OutputFormat::kAnnot:

samples/pdfium_test_write_helper.cc

diff --git a/samples/pdfium_test_write_helper.cc b/samples/pdfium_test_write_helper.cc
index f1f53b4..b6f07ea 100644
--- a/samples/pdfium_test_write_helper.cc
+++ b/samples/pdfium_test_write_helper.cc
@@ -222,7 +222,7 @@
   return std::string(filename);
 }
 
-void WriteText(FPDF_PAGE page, const char* pdf_name, int num) {
+void WriteText(FPDF_TEXTPAGE textpage, const char* pdf_name, int num) {
   char filename[256];
   int chars_formatted =
       snprintf(filename, sizeof(filename), "%s.%d.txt", pdf_name, num);
@@ -246,9 +246,8 @@
     return;
   }
 
-  ScopedFPDFTextPage textpage(FPDFText_LoadPage(page));
-  for (int i = 0; i < FPDFText_CountChars(textpage.get()); i++) {
-    uint32_t c = FPDFText_GetUnicode(textpage.get(), i);
+  for (int i = 0; i < FPDFText_CountChars(textpage); i++) {
+    uint32_t c = FPDFText_GetUnicode(textpage, i);
     if (fwrite(&c, sizeof(c), 1, fp) != 1) {
       fprintf(stderr, "Failed to write to %s\n", filename);
       break;

samples/pdfium_test_write_helper.h

diff --git a/samples/pdfium_test_write_helper.h b/samples/pdfium_test_write_helper.h
index bb4b1ac..af777b1 100644
--- a/samples/pdfium_test_write_helper.h
+++ b/samples/pdfium_test_write_helper.h
@@ -20,7 +20,7 @@
                      int stride,
                      int width,
                      int height);
-void WriteText(FPDF_PAGE page, const char* pdf_name, int num);
+void WriteText(FPDF_TEXTPAGE textpage, const char* pdf_name, int num);
 void WriteAnnot(FPDF_PAGE page, const char* pdf_name, int num);
 std::string WritePng(const char* pdf_name,
                      int num,