Merge to XFA - else after returns.

core/src/fpdfapi/fpdf_font/fpdf_font.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/fpdfapi/fpdf_module.h"
 #include "../../../include/fpdfapi/fpdf_page.h"
 #include "../../../include/fpdfapi/fpdf_pageobj.h"
 #include "../../../include/fpdfapi/fpdf_resource.h"
@@ skipping 537 matching lines @@
             } else if (buf[i] >= 'a' && buf[i] <= 'f') {
                 digit = buf[i] - 'a' + 10;
             } else if (buf[i] >= 'A' && buf[i] <= 'F') {
                 digit = buf[i] - 'A' + 10;
             } else {
                 break;
             }
             result = result * 16 + digit;
         }
         return result;
-    } else {
-        for (int i = 0; i < len; i ++) {
-            if (buf[i] < '0' || buf[i] > '9') {
-                break;
-            }
-            result = result * 10 + buf[i] - '0';
+    }
+    for (int i = 0; i < len; i ++) {
+        if (buf[i] < '0' || buf[i] > '9') {
+            break;
         }
+        result = result * 10 + buf[i] - '0';
     }
     return result;
 }
 static CFX_WideString _StringDataAdd(CFX_WideString str)
 {
     CFX_WideString ret;
     int len = str.GetLength();
     FX_WCHAR value = 1;
     for (int i = len - 1; i >= 0 ; --i) {
         FX_WCHAR ch = str[i] + value;
@@ skipping 1163 matching lines @@
     m_pForm = NULL;
     m_pBitmap = NULL;
     m_bPageRequired = FALSE;
     m_bColored = FALSE;
 }
 CPDF_Type3Char::~CPDF_Type3Char()
 {
     delete m_pForm;
     delete m_pBitmap;
 }