Annotations and fields do not have DR

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 be96d2d1d3bf46bf306f60b0f9d5aa12e81127f1..e715c6c7c0fc0480558e93fa529f86ec0cff160f 100644
--- a/core/fpdfdoc/cpvt_generateap.cpp
+++ b/core/fpdfdoc/cpvt_generateap.cpp
@@ -46,25 +46,11 @@ bool GenerateWidgetAP(CPDF_Document* pDoc,
 
   FX_FLOAT fFontSize = FX_atof(syntax.GetWord());
   CPVT_Color crText = CPVT_Color::ParseColor(DA);
-  FX_BOOL bUseFormRes = FALSE;
-  CPDF_Dictionary* pFontDict = nullptr;
-  CPDF_Dictionary* pDRDict = pAnnotDict->GetDictBy("DR");
-  if (!pDRDict) {
-    pDRDict = pFormDict->GetDictBy("DR");
-    bUseFormRes = TRUE;
-  }
+  CPDF_Dictionary* pDRDict = pFormDict->GetDictBy("DR");

[Tom Sepez, 2016/09/12 21:19:22]

nit: maybe just early return here if null to avoid ? and retest later.

[npm, 2016/09/12 21:40:11]

Done.

   CPDF_Dictionary* pDRFontDict = pDRDict ? pDRDict->GetDictBy("Font") : nullptr;
-  if (pDRFontDict) {
-    pFontDict = pDRFontDict->GetDictBy(sFontName.Mid(1));
-    if (!pFontDict && !bUseFormRes) {
-      pDRDict = pFormDict->GetDictBy("DR");
-      pDRFontDict = pDRDict->GetDictBy("Font");
-      if (pDRFontDict)
-        pFontDict = pDRFontDict->GetDictBy(sFontName.Mid(1));
-    }
-  }
   if (!pDRFontDict)
     return false;
+  CPDF_Dictionary* pFontDict = pDRFontDict->GetDictBy(sFontName.Mid(1));

[Tom Sepez, 2016/09/12 21:19:22]

nit: I'd put the blank line above this statement rather than after it.

[npm, 2016/09/12 21:40:11]

Done.

 
   if (!pFontDict) {
     pFontDict = new CPDF_Dictionary;