Fix all the code which has duplicate variable declarations

core/fpdfapi/fpdf_page/fpdf_page_parser.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 "core/fpdfapi/fpdf_page/pageint.h"
 
 #include <vector>
 
@@ skipping 1121 matching lines @@
   m_pCurStates->m_TextState.GetModify()->m_FontSize = fs;
   CPDF_Font* pFont = FindFont(GetString(1));
   if (pFont) {
     m_pCurStates->m_TextState.SetFont(pFont);
   }
 }
 
 CPDF_Object* CPDF_StreamContentParser::FindResourceObj(
     const CFX_ByteString& type,
     const CFX_ByteString& name) {
   if (!m_pResources) {

[Tom Sepez, 2016/06/01 22:23:04]

nit: no {}

[Wei Li, 2016/06/01 23:40:12]

Done.

     return NULL;
   }
   if (m_pResources == m_pPageResources) {
-    CPDF_Dictionary* pList = m_pResources->GetDictBy(type);
-    if (!pList) {
-      return NULL;
-    }
-    CPDF_Object* pRes = pList->GetDirectObjectBy(name);
+    CPDF_Dictionary* pDict = m_pResources->GetDictBy(type);
+    if (!pDict)

[Tom Sepez, 2016/06/01 22:23:04]

nit: ? operator might be cleaner.

[Wei Li, 2016/06/01 23:40:12]

See below

+      return nullptr;
+    CPDF_Object* pRes = pDict->GetDirectObjectBy(name);
     return pRes;
   }
-  CPDF_Dictionary* pList = m_pResources->GetDictBy(type);
-  if (!pList) {
-    if (!m_pPageResources) {
-      return NULL;
-    }
-    CPDF_Dictionary* pList = m_pPageResources->GetDictBy(type);
-    if (!pList) {
-      return NULL;
-    }
-    CPDF_Object* pRes = pList->GetDirectObjectBy(name);
-    return pRes;
-  }
-  CPDF_Object* pRes = pList->GetDirectObjectBy(name);
-  return pRes;
+  if (CPDF_Dictionary* pDict = m_pResources->GetDictBy(type))

[Tom Sepez, 2016/06/01 22:23:04]

either way, we're going to get m_pResources->GetDictBy(type), so call the pDict
an put it at line 1145.

[Wei Li, 2016/06/01 23:40:12]

Thanks for suggesting this, now it looks much clearer.

+    return pDict->GetDirectObjectBy(name);
+
+  if (!m_pPageResources)
+    return nullptr;
+  CPDF_Dictionary* pDict = m_pPageResources->GetDictBy(type);

[Tom Sepez, 2016/06/01 22:23:04]

Then we can call this pPageDict and avoid collisions.

[Wei Li, 2016/06/01 23:40:12]

Done.

+  return pDict ? pDict->GetDirectObjectBy(name) : nullptr;
 }
 
 CPDF_Font* CPDF_StreamContentParser::FindFont(const CFX_ByteString& name) {
   CPDF_Dictionary* pFontDict = ToDictionary(FindResourceObj("Font", name));
   if (!pFontDict) {
     m_bResourceMissing = TRUE;
     return CPDF_Font::GetStockFont(m_pDocument, "Helvetica");
   }
 
   CPDF_Font* pFont = m_pDocument->LoadFont(pFontDict);
@@ skipping 519 matching lines @@
         } else {
           PDF_ReplaceAbbr(pElement);
         }
       }
       break;
     }
     default:
       break;
   }
 }