Fix else-after-returns throughout pdfium.

fpdfsdk/src/fsdk_baseannot.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 "../include/fsdk_define.h"
 #include "../include/fsdk_mgr.h"
 #include "../include/fsdk_baseannot.h"
 
@@ skipping 733 matching lines @@
                         pBSDict = new CPDF_Dictionary;
                         m_pAnnot->GetAnnotDict()->SetAt("BS", pBSDict);
                 }
 
                 pBSDict->SetAtInteger("W", nWidth);
         }
 }
 
 int     CPDFSDK_Annot::GetBorderWidth() const
 {
-        CPDF_Array* pBorder = m_pAnnot->GetAnnotDict()->GetArray("Border");
-
-        if (pBorder)
-        {
+        if (CPDF_Array* pBorder = m_pAnnot->GetAnnotDict()->GetArray("Border")) {
                 return pBorder->GetInteger(2);
         }
-        else
-        {
-                CPDF_Dictionary* pBSDict = m_pAnnot->GetAnnotDict()->GetDict("BS");
-
-                if (pBSDict)
-                {
-                        return pBSDict->GetInteger("W", 1);
-                }
+    if (CPDF_Dictionary* pBSDict = m_pAnnot->GetAnnotDict()->GetDict("BS")) {
+        return pBSDict->GetInteger("W", 1);
         }
         return 1;
 }
 
 void CPDFSDK_Annot::SetBorderStyle(int nStyle)
 {
         CPDF_Dictionary* pBSDict = m_pAnnot->GetAnnotDict()->GetDict("BS");
         if (!pBSDict)
         {
                 pBSDict = new CPDF_Dictionary;
@@ skipping 297 matching lines @@
         return ;
 }
 
 CPDF_Page* CPDFSDK_Annot::GetPDFPage()
 {
         if(m_pPageView)
                 return m_pPageView->GetPDFPage();
         return NULL;
 }