Re-land else-after-returns

core/src/fxcodec/codec/fx_codec_icc.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 "../../../../third_party/lcms2-2.6/include/lcms2.h"
 #include "../../../include/fxcodec/fx_codec.h"
 #include "codec_int.h"
 
@@ skipping 26 matching lines @@
     }
     switch(cs) {
         case cmsSigLabData:
             if (nComponents < 3) {
                 return FALSE;
             }
             break;
         case cmsSigGrayData:
             if (bDst && nComponents != 1) {
                 return FALSE;
-            } else if (!bDst && nComponents > 2) {
+            }
+            if (!bDst && nComponents > 2) {
                 return FALSE;
             }
             break;
         case cmsSigRgbData:
             if (bDst && nComponents != 3) {
                 return FALSE;
             }
             break;
         case cmsSigCmykData:
             if (bDst && nComponents != 4) {
@@ skipping 1299 matching lines @@
     uint8_t c1 = FXSYS_round(c * 255);
     uint8_t m1 = FXSYS_round(m * 255);
     uint8_t y1 = FXSYS_round(y * 255);
     uint8_t k1 = FXSYS_round(k * 255);
     uint8_t r, g, b;
     AdobeCMYK_to_sRGB1(c1, m1, y1, k1, r, g, b);
     R = 1.0f * r / 255;
     G = 1.0f * g / 255;
     B = 1.0f * b / 255;
 }