Merge to XFA - else after returns.

core/src/fpdfapi/fpdf_font/fpdf_font_cid.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_resource.h"
 #include "../../../include/fxge/fx_freetype.h"
@@ skipping 623 matching lines @@
                 _CMap_CodeRange* pRanges = (_CMap_CodeRange*)m_pLeadingBytes;
                 int iSize = _GetCharSize(charcode, pRanges, m_nCodeRanges);
                 if (iSize == 0) {
                     iSize = 1;
                 }
                 if (iSize > 1) {
                     FXSYS_memset(str, 0, sizeof(uint8_t) * iSize);
                 }
                 str[iSize - 1] = (uint8_t)charcode;
                 return iSize;
-            } else if (charcode < 0x10000) {
+            }
+            if (charcode < 0x10000) {
                 str[0] = (uint8_t)(charcode >> 8);
                 str[1] = (uint8_t)charcode;
                 return 2;
-            } else if (charcode < 0x1000000) {
+            }
+            if (charcode < 0x1000000) {
                 str[0] = (uint8_t)(charcode >> 16);
                 str[1] = (uint8_t)(charcode >> 8);
                 str[2] = (uint8_t)charcode;
                 return 3;
-            } else {
-                str[0] = (uint8_t)(charcode >> 24);
-                str[1] = (uint8_t)(charcode >> 16);
-                str[2] = (uint8_t)(charcode >> 8);
-                str[3] = (uint8_t)charcode;
-                return 4;
             }
+            str[0] = (uint8_t)(charcode >> 24);
+            str[1] = (uint8_t)(charcode >> 16);
+            str[2] = (uint8_t)(charcode >> 8);
+            str[3] = (uint8_t)charcode;
+            return 4;
     }
     return 0;
 }
 CPDF_CID2UnicodeMap::CPDF_CID2UnicodeMap()
 {
     m_EmbeddedCount = 0;
 }
 CPDF_CID2UnicodeMap::~CPDF_CID2UnicodeMap()
 {
 }
@@ skipping 117 matching lines @@
             charsize = 2;
         }
         int ret = FXSYS_MultiByteToWideChar(g_CharsetCPs[m_pCMap->m_Coding], 0, (const FX_CHAR*)&charcode, charsize, &unicode, 1);
         if (ret != 1) {
             return 0;
         }
         return unicode;
 #endif
         if (m_pCMap->m_pEmbedMap) {
             return _EmbeddedUnicodeFromCharcode(m_pCMap->m_pEmbedMap, m_pCMap->m_Charset, charcode);
-        } else {
-            return 0;
         }
+        return 0;
     }
     return m_pCID2UnicodeMap->UnicodeFromCID(CIDFromCharCode(charcode));
 }
 FX_DWORD CPDF_CIDFont::_CharCodeFromUnicode(FX_WCHAR unicode) const
 {
     switch (m_pCMap->m_Coding) {
         case CIDCODING_UNKNOWN:
             return 0;
         case CIDCODING_UCS2:
         case CIDCODING_UTF16:
             return unicode;
         case CIDCODING_CID: {
                 if (m_pCID2UnicodeMap == NULL || !m_pCID2UnicodeMap->IsLoaded()) {
                     return 0;
                 }
                 FX_DWORD CID = 0;
                 while (CID < 65536) {
                     FX_WCHAR this_unicode = m_pCID2UnicodeMap->UnicodeFromCID((FX_WORD)CID);
                     if (this_unicode == unicode) {
                         return CID;
                     }
                     CID ++;
                 }
                 break;
             }
     }
 
     if (unicode < 0x80) {
         return static_cast<FX_DWORD>(unicode);
-    } else if (m_pCMap->m_Coding == CIDCODING_CID) {
+    }
+    if (m_pCMap->m_Coding == CIDCODING_CID) {
         return 0;
     }
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
     uint8_t buffer[32];
     int ret = FXSYS_WideCharToMultiByte(g_CharsetCPs[m_pCMap->m_Coding], 0, &unicode, 1, (char*)buffer, 4, NULL, NULL);
     if (ret == 1) {
         return buffer[0];
-    } else if (ret == 2) {
+    }
+    if (ret == 2) {
         return buffer[0] * 256 + buffer[1];
     }
-    return 0;
-#endif
+#else
     if (m_pCMap->m_pEmbedMap) {
         return _EmbeddedCharcodeFromUnicode(m_pCMap->m_pEmbedMap, m_pCMap->m_Charset, unicode);
     }
+#endif
     return 0;
 }
 static void FT_UseCIDCharmap(FXFT_Face face, int coding)
 {
     int encoding;
     switch (coding) {
         case CIDCODING_GB:
             encoding = FXFT_ENCODING_GB2312;
             break;
         case CIDCODING_BIG5:
@@ skipping 372 matching lines @@
                     FX_DWORD maccode = FT_CharCodeFromUnicode(FXFT_ENCODING_APPLE_ROMAN, unicode);
                     index = !maccode ? FXFT_Get_Name_Index(m_Font.m_Face, (char *)name) : FXFT_Get_Char_Index(m_Font.m_Face, maccode);
                 } else {
                     return FXFT_Get_Char_Index(m_Font.m_Face, unicode);
                 }
             } else {
                 return charcode == 0 ? -1 : (int)charcode;
             }
             if (index == 0 || index == 0xffff) {
                 return charcode == 0 ? -1 : (int)charcode;
-            } else {
-                return index;
             }
+            return index;
         }
         if (m_Charset == CIDSET_JAPAN1) {
             if (unicode == '\\') {
                 unicode = '/';
             }
 #if _FXM_PLATFORM_ != _FXM_PLATFORM_APPLE_
             else if (unicode == 0xa5) {
                 unicode = 0x5c;
             }
 #endif
@@ skipping 335 matching lines @@
         if (middlecode > CID) {
             end = middle - 1;
         } else if (middlecode < CID) {
             begin = middle + 1;
         } else {
             return &Japan1_VertCIDs[middle].a;
         }
     }
     return NULL;
 }