diff options
| author | Lei Zhang <thestig@chromium.org> | 2015-12-14 18:34:00 -0800 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2015-12-14 18:34:00 -0800 |
| commit | 412e908082a361d0fd9591eab939e96a882212f1 (patch) | |
| tree | 11726052ae08f13dc5a05a82cbce870758580aeb /fpdfsdk/src/formfiller | |
| parent | 96660d6f382204339d6b1aadc3913303d436e252 (diff) | |
| download | pdfium-412e908082a361d0fd9591eab939e96a882212f1.tar.xz | |
Merge to XFA: Get rid of most instance of 'foo == NULL'
TBR=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1520063002 .
(cherry picked from commit e385244f8cd6ae376f6b3cf1265a0795d5d30eff)
Review URL: https://codereview.chromium.org/1528763003 .
Diffstat (limited to 'fpdfsdk/src/formfiller')
| -rw-r--r-- | fpdfsdk/src/formfiller/FFL_CBA_Fontmap.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/fpdfsdk/src/formfiller/FFL_CBA_Fontmap.cpp b/fpdfsdk/src/formfiller/FFL_CBA_Fontmap.cpp index 743c90e817..dd58180e61 100644 --- a/fpdfsdk/src/formfiller/FFL_CBA_Fontmap.cpp +++ b/fpdfsdk/src/formfiller/FFL_CBA_Fontmap.cpp @@ -122,7 +122,7 @@ CPDF_Font* CBA_FontMap::FindResFontSameCharset(CPDF_Dictionary* pResDict, ASSERT(pDocument != NULL); CPDF_Dictionary* pFonts = pResDict->GetDict("Font"); - if (pFonts == NULL) + if (!pFonts) return NULL; CPDF_Font* pFind = NULL; @@ -132,7 +132,7 @@ CPDF_Font* CBA_FontMap::FindResFontSameCharset(CPDF_Dictionary* pResDict, CPDF_Object* pObj = NULL; CFX_ByteString csKey; pObj = pFonts->GetNextElement(pos, csKey); - if (pObj == NULL) + if (!pObj) continue; CPDF_Dictionary* pElement = ToDictionary(pObj->GetDirect()); @@ -142,10 +142,10 @@ CPDF_Font* CBA_FontMap::FindResFontSameCharset(CPDF_Dictionary* pResDict, continue; CPDF_Font* pFont = pDocument->LoadFont(pElement); - if (pFont == NULL) + if (!pFont) continue; const CFX_SubstFont* pSubst = pFont->GetSubstFont(); - if (pSubst == NULL) + if (!pSubst) continue; if (pSubst->m_Charset == nCharset) { sFontAlias = csKey; @@ -170,7 +170,7 @@ void CBA_FontMap::AddFontToAnnotDict(CPDF_Font* pFont, CPDF_Dictionary* pAPDict = m_pAnnotDict->GetDict("AP"); - if (pAPDict == NULL) { + if (!pAPDict) { pAPDict = new CPDF_Dictionary; m_pAnnotDict->SetAt("AP", pAPDict); } @@ -181,7 +181,7 @@ void CBA_FontMap::AddFontToAnnotDict(CPDF_Font* pFont, return; CPDF_Stream* pStream = pAPDict->GetStream(m_sAPType); - if (pStream == NULL) { + if (!pStream) { pStream = new CPDF_Stream(NULL, 0, NULL); int32_t objnum = m_pDocument->AddIndirectObject(pStream); pAPDict->SetAtReference(m_sAPType, m_pDocument, objnum); |