Generate default AP stream for underline annotation.

core/fpdfdoc/cpvt_generateap.cpp

Index: core/fpdfdoc/cpvt_generateap.cpp
diff --git a/core/fpdfdoc/cpvt_generateap.cpp b/core/fpdfdoc/cpvt_generateap.cpp
index 13ef5061580a90beefb2cc89a169a34a74c25e04..cebe36a01b847e345f28afa7df1ccb775b4bfca3 100644
--- a/core/fpdfdoc/cpvt_generateap.cpp
+++ b/core/fpdfdoc/cpvt_generateap.cpp
@@ -443,6 +443,22 @@ bool GenerateWidgetAP(CPDF_Document* pDoc,
   return true;
 }
 
+CPDF_Dictionary* GenerateExtGStateDict(CFX_ByteString sName,

[Lei Zhang, 2016/08/02 01:22:57]

Pass CFX_ByteStrings by const-ref?

[jaepark, 2016/08/02 20:31:34]

Done.

+                                       FX_FLOAT fOpacity,
+                                       CFX_ByteString sBlendMode) {
+  CPDF_Dictionary* pGSDict = new CPDF_Dictionary;
+  pGSDict->SetAtString("Type", "ExtGState");
+  pGSDict->SetAtNumber("CA", fOpacity);
+  pGSDict->SetAtNumber("ca", fOpacity);
+  pGSDict->SetAtBoolean("AIS", false);
+  pGSDict->SetAtString("BM", sBlendMode);
+
+  CPDF_Dictionary* pExtGStateDict = new CPDF_Dictionary;
+  pExtGStateDict->SetAt(sName, pGSDict);
+
+  return pExtGStateDict;
+}
+
 }  // namespace
 
 bool FPDF_GenerateAP(CPDF_Document* pDoc, CPDF_Dictionary* pAnnotDict) {
@@ -501,7 +517,8 @@ bool CPVT_GenerateAP::GenerateHighlightAP(CPDF_Document* pDoc,
     return false;
 
   CFX_ByteTextBuf sAppStream;
-  sAppStream << "/GS gs ";
+  CFX_ByteString sExtGSDictName = "GS";
+  sAppStream << "/" << sExtGSDictName << " gs ";
 
   if (pAnnotDict->KeyExist("C")) {
     CPDF_Array* pColor = pAnnotDict->GetArrayBy("C");
@@ -536,21 +553,65 @@ bool CPVT_GenerateAP::GenerateHighlightAP(CPDF_Document* pDoc,
   pStreamDict->SetAtMatrix("Matrix", CFX_Matrix());
   pStreamDict->SetAtRect("BBox", rect);
 
-  CPDF_Dictionary* pGSDict = new CPDF_Dictionary;
-  pGSDict->SetAtString("Type", "ExtGState");
-
+  CPDF_Dictionary* pResourceDict = new CPDF_Dictionary;
   FX_FLOAT fOpacity =
       pAnnotDict->KeyExist("CA") ? pAnnotDict->GetNumberBy("CA") : 1;
-  pGSDict->SetAtNumber("ca", fOpacity);
-  pGSDict->SetAtNumber("CA", fOpacity);
-  pGSDict->SetAtBoolean("AIS", false);
-  pGSDict->SetAtString("BM", "Multiply");
+  pResourceDict->SetAt(
+      "ExtGState", GenerateExtGStateDict(sExtGSDictName, fOpacity, "Multiply"));
 
-  CPDF_Dictionary* pExtGStateDict = new CPDF_Dictionary;
-  pExtGStateDict->SetAt("GS", pGSDict);
+  pStreamDict->SetAt("Resources", pResourceDict);
+  return true;
+}
+
+bool CPVT_GenerateAP::GenerateUnderlineAP(CPDF_Document* pDoc,
+                                          CPDF_Dictionary* pAnnotDict) {
+  // If AP dictionary exists, we use the appearance defined in the
+  // existing AP dictionary.
+  if (pAnnotDict->KeyExist("AP"))
+    return false;
+
+  CFX_ByteTextBuf sAppStream;
+  CFX_ByteString sExtGSDictName = "GS";
+  sAppStream << "/" << sExtGSDictName << " gs ";
+
+  if (pAnnotDict->KeyExist("C")) {

[Lei Zhang, 2016/08/02 01:22:57]

Can this and the identical block in GenerateHighlightAP() be refactored out into
a separate helper function? Ditto below for any piece that makes sense.

[jaepark, 2016/08/02 20:31:34]

Done.

+    CPDF_Array* pColor = pAnnotDict->GetArrayBy("C");
+    CPVT_Color color = CPVT_Color::ParseColor(*pColor);
+    sAppStream << CPVT_GenerateAP::GenerateColorAP(color, FALSE);
+  } else {
+    // Defaults to 0x000000 color for underline.
+    sAppStream << "0 0 0 RG\n";
+  }
+
+  CFX_FloatRect rect = pAnnotDict->GetRectBy("Rect");
+  rect.Normalize();
+
+  FX_FLOAT fLineWidth = 1.0;
+  sAppStream << fLineWidth << " w " << rect.left << " "
+             << rect.bottom + fLineWidth << " m " << rect.right << " "
+             << rect.bottom + fLineWidth << " l S\n";
+
+  CPDF_Dictionary* pAPDict = new CPDF_Dictionary;
+  pAnnotDict->SetAt("AP", pAPDict);
+
+  CPDF_Stream* pNormalStream = new CPDF_Stream(nullptr, 0, nullptr);
+  int32_t objnum = pDoc->AddIndirectObject(pNormalStream);
+  pAnnotDict->GetDictBy("AP")->SetAtReference("N", pDoc, objnum);
+
+  pNormalStream->SetData(reinterpret_cast<uint8_t*>(sAppStream.GetBuffer()),
+                         sAppStream.GetSize(), FALSE, FALSE);
+
+  CPDF_Dictionary* pStreamDict = pNormalStream->GetDict();
+  pStreamDict->SetAtInteger("FormType", 1);
+  pStreamDict->SetAtString("Subtype", "Form");
+  pStreamDict->SetAtMatrix("Matrix", CFX_Matrix());
+  pStreamDict->SetAtRect("BBox", rect);
 
   CPDF_Dictionary* pResourceDict = new CPDF_Dictionary;
-  pResourceDict->SetAt("ExtGState", pExtGStateDict);
+  FX_FLOAT fOpacity =
+      pAnnotDict->KeyExist("CA") ? pAnnotDict->GetNumberBy("CA") : 1;
+  pResourceDict->SetAt(
+      "ExtGState", GenerateExtGStateDict(sExtGSDictName, fOpacity, "Normal"));
 
   pStreamDict->SetAt("Resources", pResourceDict);
   return true;