Use /RECT or /QuadPoints for annotation coordinates, depending on /AP

core/fpdfdoc/include/cpdf_annot.h

Index: core/fpdfdoc/include/cpdf_annot.h
diff --git a/core/fpdfdoc/include/cpdf_annot.h b/core/fpdfdoc/include/cpdf_annot.h
index 82b3d3ca3132db318c73e85995d969162eb1e329..2ada6414e944b52badd883ac84482f264e8cc858 100644
--- a/core/fpdfdoc/include/cpdf_annot.h
+++ b/core/fpdfdoc/include/cpdf_annot.h
@@ -13,6 +13,7 @@
 #include "core/fxcrt/include/fx_coordinates.h"
 #include "core/fxcrt/include/fx_string.h"
 #include "core/fxcrt/include/fx_system.h"
+#include "core/fpdfapi/fpdf_parser/include/cpdf_array.h"

[Lei Zhang, 2016/09/01 21:13:00]

Just forward declare.

If you were keeping it, I would have asked for alphabetical order.

[tonikitoo, 2016/09/01 21:50:42]

Done.

 
 class CFX_RenderDevice;
 class CPDF_Dictionary;
@@ -100,6 +101,7 @@ class CPDF_Annot {
 
  private:
   void GenerateAPIfNeeded();
+  bool ShouldUseQuadPointsCoords(CPDF_Array*&) const;

[Lei Zhang, 2016/09/01 21:13:00]

Please try not do add more parameters that pass by non-const ref. Also name the
parameter.

[tonikitoo, 2016/09/01 21:50:41]

Done.

 
   CPDF_Dictionary* const m_pAnnotDict;
   CPDF_Document* const m_pDocument;
@@ -107,6 +109,7 @@ class CPDF_Annot {
   std::map<CPDF_Stream*, std::unique_ptr<CPDF_Form>> m_APMap;
   // |m_bOpenState| is only set for popup annotations.
   bool m_bOpenState;
+  bool m_bHasGeneratedAP;
   // Not owned. If there is a valid pointer in |m_pPopupAnnot|,
   // then this annot is never a popup.
   CPDF_Annot* m_pPopupAnnot;