summaryrefslogtreecommitdiff
path: root/core/fpdfdoc/cpdf_annot.cpp
diff options
context:
space:
mode:
authortonikitoo <tonikitoo@igalia.com>2016-09-15 13:50:50 -0700
committerCommit bot <commit-bot@chromium.org>2016-09-15 13:50:50 -0700
commit0a17fafd723e8684d1deb4b5ceea58967a0154da (patch)
tree6e438c8fab198e4e315243be858feaaff7a1a813 /core/fpdfdoc/cpdf_annot.cpp
parent84be3a3cfec5107aac9a58ea00b58b733d393c7d (diff)
downloadpdfium-0a17fafd723e8684d1deb4b5ceea58967a0154da.tar.xz
Use either /RECT or /QuadPoints for annotation coordinates, depending on /AP
On Acrobat, if "/AP" is present on a text markup definition, the coordinates used to draw the annotation come from "/Rect values, whereas if "/AP" is not defined, the array defined in /QuadPoints is used to grab the annotation coordinates from. PDFium, on the other hand, uses "/Rect" regardless of presence or absence of "/AP". CL fixes PDFium to work similarly to Acrobat, in this case. TEST=testing/resources/pixel/bug_585_*.in BUG=pdfium:585 Review-Url: https://codereview.chromium.org/2289293005
Diffstat (limited to 'core/fpdfdoc/cpdf_annot.cpp')
-rw-r--r--core/fpdfdoc/cpdf_annot.cpp69
1 files changed, 59 insertions, 10 deletions
diff --git a/core/fpdfdoc/cpdf_annot.cpp b/core/fpdfdoc/cpdf_annot.cpp
index bee96a62ff..2cc767a066 100644
--- a/core/fpdfdoc/cpdf_annot.cpp
+++ b/core/fpdfdoc/cpdf_annot.cpp
@@ -20,6 +20,15 @@
namespace {
+char kPDFiumKey_HasGeneratedAP[] = "PDFIUM_HasGeneratedAP";
+
+bool IsTextMarkupAnnotation(CPDF_Annot::Subtype type) {
+ return type == CPDF_Annot::Subtype::HIGHLIGHT ||
+ type == CPDF_Annot::Subtype::SQUIGGLY ||
+ type == CPDF_Annot::Subtype::STRIKEOUT ||
+ type == CPDF_Annot::Subtype::UNDERLINE;
+}
+
bool ShouldGenerateAPForAnnotation(CPDF_Dictionary* pAnnotDict) {
// If AP dictionary exists, we use the appearance defined in the
// existing AP dictionary.
@@ -40,6 +49,8 @@ CPDF_Annot::CPDF_Annot(CPDF_Dictionary* pDict,
m_bOpenState(false),
m_pPopupAnnot(nullptr) {
m_nSubtype = StringToAnnotSubtype(m_pAnnotDict->GetStringFor("Subtype"));
+ m_bIsTextMarkupAnnotation = IsTextMarkupAnnotation(m_nSubtype);
+ m_bHasGeneratedAP = m_pAnnotDict->GetBooleanFor(kPDFiumKey_HasGeneratedAP);
GenerateAPIfNeeded();
}
@@ -53,24 +64,30 @@ void CPDF_Annot::GenerateAPIfNeeded() {
if (!ShouldGenerateAPForAnnotation(m_pAnnotDict))
return;
+ bool result = false;
if (m_nSubtype == CPDF_Annot::Subtype::CIRCLE)
- CPVT_GenerateAP::GenerateCircleAP(m_pDocument, m_pAnnotDict);
+ result = CPVT_GenerateAP::GenerateCircleAP(m_pDocument, m_pAnnotDict);
else if (m_nSubtype == CPDF_Annot::Subtype::HIGHLIGHT)
- CPVT_GenerateAP::GenerateHighlightAP(m_pDocument, m_pAnnotDict);
+ result = CPVT_GenerateAP::GenerateHighlightAP(m_pDocument, m_pAnnotDict);
else if (m_nSubtype == CPDF_Annot::Subtype::INK)
- CPVT_GenerateAP::GenerateInkAP(m_pDocument, m_pAnnotDict);
+ result = CPVT_GenerateAP::GenerateInkAP(m_pDocument, m_pAnnotDict);
else if (m_nSubtype == CPDF_Annot::Subtype::POPUP)
- CPVT_GenerateAP::GeneratePopupAP(m_pDocument, m_pAnnotDict);
+ result = CPVT_GenerateAP::GeneratePopupAP(m_pDocument, m_pAnnotDict);
else if (m_nSubtype == CPDF_Annot::Subtype::SQUARE)
- CPVT_GenerateAP::GenerateSquareAP(m_pDocument, m_pAnnotDict);
+ result = CPVT_GenerateAP::GenerateSquareAP(m_pDocument, m_pAnnotDict);
else if (m_nSubtype == CPDF_Annot::Subtype::SQUIGGLY)
- CPVT_GenerateAP::GenerateSquigglyAP(m_pDocument, m_pAnnotDict);
+ result = CPVT_GenerateAP::GenerateSquigglyAP(m_pDocument, m_pAnnotDict);
else if (m_nSubtype == CPDF_Annot::Subtype::STRIKEOUT)
- CPVT_GenerateAP::GenerateStrikeOutAP(m_pDocument, m_pAnnotDict);
+ result = CPVT_GenerateAP::GenerateStrikeOutAP(m_pDocument, m_pAnnotDict);
else if (m_nSubtype == CPDF_Annot::Subtype::TEXT)
- CPVT_GenerateAP::GenerateTextAP(m_pDocument, m_pAnnotDict);
+ result = CPVT_GenerateAP::GenerateTextAP(m_pDocument, m_pAnnotDict);
else if (m_nSubtype == CPDF_Annot::Subtype::UNDERLINE)
- CPVT_GenerateAP::GenerateUnderlineAP(m_pDocument, m_pAnnotDict);
+ result = CPVT_GenerateAP::GenerateUnderlineAP(m_pDocument, m_pAnnotDict);
+
+ if (result) {
+ m_pAnnotDict->SetBooleanFor(kPDFiumKey_HasGeneratedAP, result);
+ m_bHasGeneratedAP = result;
+ }
}
bool CPDF_Annot::ShouldDrawAnnotation() {
@@ -91,11 +108,23 @@ CPDF_Annot::Subtype CPDF_Annot::GetSubtype() const {
return m_nSubtype;
}
+CFX_FloatRect CPDF_Annot::RectForDrawing() const {
+ if (!m_pAnnotDict)
+ return CFX_FloatRect();
+
+ bool bShouldUseQuadPointsCoords =
+ m_bIsTextMarkupAnnotation && m_bHasGeneratedAP;
+ if (bShouldUseQuadPointsCoords)
+ return RectFromQuadPoints(m_pAnnotDict);
+
+ return m_pAnnotDict->GetRectFor("Rect");
+}
+
CFX_FloatRect CPDF_Annot::GetRect() const {
if (!m_pAnnotDict)
return CFX_FloatRect();
- CFX_FloatRect rect = m_pAnnotDict->GetRectFor("Rect");
+ CFX_FloatRect rect = RectForDrawing();
rect.Normalize();
return rect;
}
@@ -176,6 +205,26 @@ static CPDF_Form* FPDFDOC_Annot_GetMatrix(const CPDF_Page* pPage,
}
// Static.
+CFX_FloatRect CPDF_Annot::RectFromQuadPoints(CPDF_Dictionary* pAnnotDict) {
+ CPDF_Array* pArray = pAnnotDict->GetArrayFor("QuadPoints");
+ if (!pArray)
+ return CFX_FloatRect();
+
+ // QuadPoints are defined with 4 pairs of numbers
+ // ([ pair0, pair1, pair2, pair3 ]), where
+ // pair0 = top_left
+ // pair1 = top_right
+ // pair2 = bottom_left
+ // pair3 = bottom_right
+ //
+ // On the other hand, /Rect is define as 2 pairs [pair0, pair1] where:
+ // pair0 = bottom_left
+ // pair1 = top_right.
+ return CFX_FloatRect(pArray->GetNumberAt(4), pArray->GetNumberAt(5),
+ pArray->GetNumberAt(2), pArray->GetNumberAt(3));
+}
+
+// Static.
bool CPDF_Annot::IsAnnotationHidden(CPDF_Dictionary* pAnnotDict) {
return !!(pAnnotDict->GetIntegerFor("F") & ANNOTFLAG_HIDDEN);
}