Fix else-after-returns throughout pdfium.

fpdfsdk/src/fsdk_baseannot.cpp

Index: fpdfsdk/src/fsdk_baseannot.cpp
diff --git a/fpdfsdk/src/fsdk_baseannot.cpp b/fpdfsdk/src/fsdk_baseannot.cpp
index e35e537765986baa97325a0f679bf9fdbf8e68fc..f44b5d34c1cec4a631f5596b12e2b24803b06d41 100644
--- a/fpdfsdk/src/fsdk_baseannot.cpp
+++ b/fpdfsdk/src/fsdk_baseannot.cpp
@@ -751,20 +751,11 @@ void CPDFSDK_Annot::SetBorderWidth(int 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;
 }