From 3c012fef2bb72c8ec1faa73e11ee35539b2559d6 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Wed, 22 Jul 2015 15:14:14 -0700 Subject: Re-land else-after-returns Revert "Revert "Fix else-after-returns throughout pdfium."" This reverts commit 4eb4d7f6c707cc2c23c806aa540d055c8832b55d. Fix one naming conflict. TBR=thestig@chromium.org Review URL: https://codereview.chromium.org/1243953004 . --- core/src/fxcodec/codec/fx_codec_icc.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'core/src/fxcodec/codec/fx_codec_icc.cpp') diff --git a/core/src/fxcodec/codec/fx_codec_icc.cpp b/core/src/fxcodec/codec/fx_codec_icc.cpp index da503c03fd..7507fe5d6d 100644 --- a/core/src/fxcodec/codec/fx_codec_icc.cpp +++ b/core/src/fxcodec/codec/fx_codec_icc.cpp @@ -44,7 +44,8 @@ FX_BOOL CheckComponents(cmsColorSpaceSignature cs, int nComponents, FX_BOOL bDst case cmsSigGrayData: if (bDst && nComponents != 1) { return FALSE; - } else if (!bDst && nComponents > 2) { + } + if (!bDst && nComponents > 2) { return FALSE; } break; -- cgit v1.2.3