Annotations and fields do not have DR

fpdfsdk/formfiller/cba_fontmap.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "fpdfsdk/formfiller/cba_fontmap.h"
 
 #include "core/fpdfapi/fpdf_font/include/cpdf_font.h"
 #include "core/fpdfapi/fpdf_page/include/cpdf_page.h"
@@ skipping 204 matching lines @@
 
   if (bWidget) {
     if (sDA.IsEmpty()) {
       pObj = FPDF_GetFieldAttr(pAcroFormDict, "DA");
       sDA = pObj ? pObj->GetString() : CFX_ByteString();
     }
   }
 
   CPDF_Dictionary* pFontDict = nullptr;
 
   if (!sDA.IsEmpty()) {

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

nit: can we avoid some indentation with early returns?

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

Cleanly, just one :( I can replace the if stack with "?", but I don't know which
is more ugly.

     CPDF_SimpleParser syntax(sDA.AsStringC());
     syntax.FindTagParamFromStart("Tf", 2);
     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) {
         if (pAcroFormDict) {
           if (CPDF_Dictionary* pDRDict = pAcroFormDict->GetDictBy("DR"))
             if (CPDF_Dictionary* pDRFontDict = pDRDict->GetDictBy("Font"))
               pFontDict = pDRFontDict->GetDictBy(sAlias);
         }
       }
     }
   }
 
   return pFontDict ? m_pDocument->LoadFont(pFontDict) : nullptr;
 }
 
 void CBA_FontMap::SetAPType(const CFX_ByteString& sAPType) {
   m_sAPType = sAPType;
 
   Reset();
   Initialize();
 }