Fix else-after-returns throughout pdfium.

core/src/fxge/skia/fx_skia_blitter_new.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.
 
 #include "../../../include/fxge/fx_ge.h"
 //#define _SKIA_SUPPORT_
 #if defined(_SKIA_SUPPORT_)
 #include "../../../include/fxcodec/fx_codec.h"
 #include "SkBlitter.h"
 #include "fx_skia_blitter_new.h"
@@ skipping 1368 matching lines @@
                                         if (!pIccTransform)
                                                 return FALSE;
                                         color = FXARGB_TODIB(color);
                                         pIccModule->TranslateScanline(pIccTransform, (uint8_t*)&m_Color, (const uint8_t*)&color, 1);
                                 }
                                 m_Red   = ((uint8_t*)&m_Color)[0];
                                 m_Green = ((uint8_t*)&m_Color)[1];
                                 m_Blue  = ((uint8_t*)&m_Color)[2];
                                 m_Gray  = ((uint8_t*)&m_Color)[3];
                                 return TRUE;
-                        } else {
-                                if (pIccTransform) {
-                                        color = bObjectCMYK ? FXCMYK_TODIB(color) : FXARGB_TODIB(color);
-                                        pIccModule->TranslateScanline(pIccTransform, (uint8_t*)&m_Color, (const uint8_t*)&color, 1);
-                                        ((uint8_t*)&m_Color)[3] = m_Alpha;
-                                        m_Red = ((uint8_t*)&m_Color)[2];
-                                        m_Green = ((uint8_t*)&m_Color)[1];
-                                        m_Blue = ((uint8_t*)&m_Color)[0];
-                                        // Need Johnson to improvement it.
-                                        if (m_bRgbByteOrder) {
-                                                // swap
-                                                m_Red = ((uint8_t*)&m_Color)[0];
-                                                m_Blue = ((uint8_t*)&m_Color)[2];
-                                                m_Color = FXARGB_TODIB(m_Color);
-                                                m_Color = FXARGB_TOBGRORDERDIB(m_Color);
-                                        }
-                                } else {
-                                        if (bObjectCMYK) {
-                                                uint8_t r, g, b;
-                                                AdobeCMYK_to_sRGB1(FXSYS_GetCValue(color), FXSYS_GetMValue(color), FXSYS_GetYValue(color), FXSYS_GetKValue(color),
-                                                        r, g, b);
-                                                m_Color = FXARGB_MAKE(m_Alpha, r, g, b);
-                                                if (m_bRgbByteOrder){
-                                                        m_Color = FXARGB_TOBGRORDERDIB(m_Color);
-                                                        m_Red = b; m_Green = g; m_Blue = r;//
-                                                }else {
-                                                        m_Color = FXARGB_TODIB(m_Color);
-                                                        m_Red = r; m_Green = g; m_Blue = b;//
-                                                }
-                                        } else {
-                                                if (m_bRgbByteOrder){
-                                                        m_Color = FXARGB_TOBGRORDERDIB(color);
-                                                        ArgbDecode(color, m_Alpha, m_Blue, m_Green, m_Red); //
-                                                }else {
-                                                        m_Color = FXARGB_TODIB(color);
-                                                        ArgbDecode(color, m_Alpha, m_Red, m_Green, m_Blue);
-                                                }
-                                        }
-                                }
+                        }
+            if (pIccTransform) {
+                color = bObjectCMYK ? FXCMYK_TODIB(color) : FXARGB_TODIB(color);
+                pIccModule->TranslateScanline(pIccTransform, (uint8_t*)&m_Color, (const uint8_t*)&color, 1);
+                ((uint8_t*)&m_Color)[3] = m_Alpha;
+                m_Red = ((uint8_t*)&m_Color)[2];
+                m_Green = ((uint8_t*)&m_Color)[1];
+                m_Blue = ((uint8_t*)&m_Color)[0];
+                // Need Johnson to improvement it.
+                if (m_bRgbByteOrder) {
+                    // swap
+                    m_Red = ((uint8_t*)&m_Color)[0];
+                    m_Blue = ((uint8_t*)&m_Color)[2];
+                    m_Color = FXARGB_TODIB(m_Color);
+                    m_Color = FXARGB_TOBGRORDERDIB(m_Color);
+                }
+            } else {
+                if (bObjectCMYK) {
+                    uint8_t r, g, b;
+                    AdobeCMYK_to_sRGB1(FXSYS_GetCValue(color), FXSYS_GetMValue(color), FXSYS_GetYValue(color), FXSYS_GetKValue(color),
+                                       r, g, b);
+                    m_Color = FXARGB_MAKE(m_Alpha, r, g, b);
+                    if (m_bRgbByteOrder){
+                        m_Color = FXARGB_TOBGRORDERDIB(m_Color);
+                        m_Red = b; m_Green = g; m_Blue = r;//
+                    }else {
+                        m_Color = FXARGB_TODIB(m_Color);
+                        m_Red = r; m_Green = g; m_Blue = b;//
+                    }
+                } else {
+                    if (m_bRgbByteOrder){
+                        m_Color = FXARGB_TOBGRORDERDIB(color);
+                        ArgbDecode(color, m_Alpha, m_Blue, m_Green, m_Red); //
+                    }else {
+                        m_Color = FXARGB_TODIB(color);
+                        ArgbDecode(color, m_Alpha, m_Red, m_Green, m_Blue);
+                    }
+                }
                         }
                 }
                 // Get palette transparency selector
                 m_ProcessFilter = (m_pOriDevice? 1 : 0) /* has Ori Device flag */
                                                 + (m_pDevice->GetBPP() >= 8 ? 2 : 0)    /* bpp flag */
                                                 + (m_pClipMask? 4 : 0)                                  /* has clip region flag */
                                                 + (m_pDevice->m_pAlphaMask? 8 : 0);             /* has Alpha Mask chanel flag */
                 switch(m_ProcessFilter) {
                         case 0:
                                 composite_span = &CFX_SkiaRenderer::CompositeSpan1bpp_0;
@@ skipping 163 matching lines @@
                 m_pDevice = pDevice;
                 m_Left = Left;
                 m_Top = Top;
                 if (pDevice){
                         m_dstWidth = m_Left + pDevice->GetWidth();
                         m_dstHeight = m_Top + pDevice->GetHeight();
                 }
                 return TRUE;
         }
 #endif