Annotations and fields do not have DR

fpdfsdk/formfiller/cba_fontmap.cpp

Index: fpdfsdk/formfiller/cba_fontmap.cpp
diff --git a/fpdfsdk/formfiller/cba_fontmap.cpp b/fpdfsdk/formfiller/cba_fontmap.cpp
index a816e2ce7fe42f95a0ded5587249d626b6feaa1a..36a653b5b397b3e9f2c3b9ca5d01f4af94738feb 100644
--- a/fpdfsdk/formfiller/cba_fontmap.cpp
+++ b/fpdfsdk/formfiller/cba_fontmap.cpp
@@ -228,18 +228,12 @@ CPDF_Font* CBA_FontMap::GetAnnotDefaultFont(CFX_ByteString& sAlias) {
     CFX_ByteString sFontName(syntax.GetWord());
     sAlias = PDF_NameDecode(sFontName).Mid(1);
 
-    if (CPDF_Dictionary* pDRDict = m_pAnnotDict->GetDictBy("DR"))
-      if (CPDF_Dictionary* pDRFontDict = pDRDict->GetDictBy("Font"))
-        pFontDict = pDRFontDict->GetDictBy(sAlias);
-
-    if (!pFontDict)
-      if (CPDF_Dictionary* pAPDict = m_pAnnotDict->GetDictBy("AP"))
-        if (CPDF_Dictionary* pNormalDict = pAPDict->GetDictBy("N"))
-          if (CPDF_Dictionary* pNormalResDict =
-                  pNormalDict->GetDictBy("Resources"))
-            if (CPDF_Dictionary* pResFontDict =
-                    pNormalResDict->GetDictBy("Font"))
-              pFontDict = pResFontDict->GetDictBy(sAlias);
+    if (CPDF_Dictionary* pAPDict = m_pAnnotDict->GetDictBy("AP"))

[dsinclair, 2016/09/12 20:51:49]

These need {}'s added.

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

Done.

+      if (CPDF_Dictionary* pNormalDict = pAPDict->GetDictBy("N"))
+        if (CPDF_Dictionary* pNormalResDict =
+                pNormalDict->GetDictBy("Resources"))
+          if (CPDF_Dictionary* pResFontDict = pNormalResDict->GetDictBy("Font"))
+            pFontDict = pResFontDict->GetDictBy(sAlias);
 
     if (bWidget) {
       if (!pFontDict) {