commit a2e776a2baa8c153cf4b56f585e957420c704fcc
author Lei Zhang <thestig@chromium.org> Wed Aug 11 20:29:28 2021 +0000
committer Pdfium LUCI CQ <pdfium-scoped@luci-project-accounts.iam.gserviceaccount.com> Wed Aug 11 20:29:28 2021 +0000
tree 77ef30ac138ab267607ba6b8bae6d22c52f0fe63
parent 9b2e15f62d515a7a6da6b43b6afe073ae33ce4a1

Support page rotations in CPDF_NPageToOneExporter.

PDF pages can have /Rotation fields. Take this into account when
creating form XObjects from pages by specifying a /Matrix to reflect the
page rotation.

Adjust FPDFPPOEmbedderTest test cases that have page rotation with
updated checksums to reflect the now correct renderings.

Bug: chromium:1229106
Change-Id: I92bb8214cf51635a5a65c519d393104465dcab97
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/84073
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Hui Yingst <nigi@chromium.org>

core/fpdfapi/page/cpdf_page.h

diff --git a/core/fpdfapi/page/cpdf_page.h b/core/fpdfapi/page/cpdf_page.h
index 56bc6b1..96eb568 100644
--- a/core/fpdfapi/page/cpdf_page.h
+++ b/core/fpdfapi/page/cpdf_page.h
@@ -73,6 +73,7 @@
 
   void ParseContent();
   const CFX_SizeF& GetPageSize() const { return m_PageSize; }
+  const CFX_Matrix& GetPageMatrix() const { return m_PageMatrix; }
   int GetPageRotation() const;
   RenderCacheIface* GetRenderCache() const { return m_pRenderCache.get(); }
   void SetRenderCache(std::unique_ptr<RenderCacheIface> pCache) {

fpdfsdk/fpdf_ppo.cpp

diff --git a/fpdfsdk/fpdf_ppo.cpp b/fpdfsdk/fpdf_ppo.cpp
index 9169a14..3939109 100644
--- a/fpdfsdk/fpdf_ppo.cpp
+++ b/fpdfsdk/fpdf_ppo.cpp
@@ -618,7 +618,7 @@
   pNewXObjectDict->SetNewFor<CPDF_Name>("Subtype", "Form");
   pNewXObjectDict->SetNewFor<CPDF_Number>("FormType", 1);
   pNewXObjectDict->SetRectFor("BBox", pSrcPage->GetBBox());
-  // TODO(xlou): add matrix field to pNewXObjectDict.
+  pNewXObjectDict->SetMatrixFor("Matrix", pSrcPage->GetPageMatrix());
 
   if (pSrcContentObj) {
     ByteString bsSrcContentStream;

fpdfsdk/fpdf_ppo_embeddertest.cpp

diff --git a/fpdfsdk/fpdf_ppo_embeddertest.cpp b/fpdfsdk/fpdf_ppo_embeddertest.cpp
index 3a2143e..712fa2d 100644
--- a/fpdfsdk/fpdf_ppo_embeddertest.cpp
+++ b/fpdfsdk/fpdf_ppo_embeddertest.cpp
@@ -128,10 +128,10 @@
   const int kPageCount = 2;
 #if defined(_SKIA_SUPPORT_) || defined(_SKIA_SUPPORT_PATHS_)
   static constexpr const char* kExpectedMD5s[kPageCount] = {
-      "bf8fa88dc85a9897931273168e8e1a30", "4fa6a7507e9f3ef4f28719a7d656c3a5"};
+      "7a4cddd5a17a60ce50acb53e318d94f8", "4fa6a7507e9f3ef4f28719a7d656c3a5"};
 #else
   static constexpr const char* kExpectedMD5s[kPageCount] = {
-      "4d225b961da0f1bced7c83273e64c9b6", "fb18142190d770cfbc329d2b071aee4d"};
+      "72d0d7a19a2f40e010ca6a1133b33e1e", "fb18142190d770cfbc329d2b071aee4d"};
 #endif
   ScopedFPDFDocument output_doc_3up(
       FPDF_ImportNPagesToOne(document(), 792, 612, 3, 1));
@@ -307,8 +307,7 @@
   static constexpr int kPageCount = 4;
   static constexpr int kTwoUpPageCount = 2;
   static const char kRectsChecksum[] = "140d629b3c96a07ced2e3e408ea85a1d";
-  static const char kBadTwoUpChecksum[] = "1d12f824e6e1710a91bbb13a903e300a";
-  static const char kGoodTwoUpChecksum[] = "fa4501562301b2e75da354bd067495ec";
+  static const char kTwoUpChecksum[] = "fa4501562301b2e75da354bd067495ec";
 
   ASSERT_TRUE(OpenDocument("bug_1229106.pdf"));
 
@@ -328,9 +327,7 @@
   for (int i = 0; i < kTwoUpPageCount; ++i) {
     ScopedFPDFPage page(FPDF_LoadPage(output_doc_2up.get(), i));
     ScopedFPDFBitmap bitmap = RenderPage(page.get());
-    // TODO(crbug.com/1229106): Both pages should render the same.
-    CompareBitmap(bitmap.get(), 612, 792,
-                  i == 0 ? kBadTwoUpChecksum : kGoodTwoUpChecksum);
+    CompareBitmap(bitmap.get(), 612, 792, kTwoUpChecksum);
   }
 }