From 7cc97521db1e52d5927f5605de5f9a7102f8af40 Mon Sep 17 00:00:00 2001
From: Tom Sepez <tsepez@chromium.org>
Date: Wed, 22 Jul 2015 14:59:55 -0700
Subject: Fix else-after-returns throughout pdfium.

Driven by CS search for
pcre:yes file:third_party/pdfium/ -file:pdfium/third_party/
\breturn\b[^;]*;\s*\n*\s*\}*\s*\n*\r*else

Note: Care is required to ensure the preceding block is not an else-if.

As usual, removed any tabs I saw.

R=thestig@chromium.org

Review URL: https://codereview.chromium.org/1243883003 .
---
 core/src/fxcodec/codec/fx_codec_icc.cpp  |  3 +-
 core/src/fxcodec/codec/fx_codec_jbig.cpp | 51 ++++++++++++++++----------------
 core/src/fxcodec/codec/fx_codec_jpeg.cpp |  6 ++--
 3 files changed, 31 insertions(+), 29 deletions(-)

(limited to 'core/src/fxcodec')

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;
diff --git a/core/src/fxcodec/codec/fx_codec_jbig.cpp b/core/src/fxcodec/codec/fx_codec_jbig.cpp
index 7a69a24d40..51184306eb 100644
--- a/core/src/fxcodec/codec/fx_codec_jbig.cpp
+++ b/core/src/fxcodec/codec/fx_codec_jbig.cpp
@@ -172,35 +172,34 @@ FXCODEC_STATUS CCodec_Jbig2Module::ContinueDecode(void* pJbig2Context, IFX_Pause
 {
     CCodec_Jbig2Context* m_pJbig2Context = (CCodec_Jbig2Context*)pJbig2Context;
     int ret = m_pJbig2Context->m_pContext->Continue(pPause);
-    if(m_pJbig2Context->m_pContext->GetProcessiveStatus() == FXCODEC_STATUS_DECODE_FINISH) {
-        if(m_pJbig2Context->m_bFileReader) {
-            CJBig2_Context::DestroyContext(m_pJbig2Context->m_pContext);
-            m_pJbig2Context->m_pContext = NULL;
-            if (ret != JBIG2_SUCCESS) {
-                if(m_pJbig2Context->m_src_buf) {
-                    FX_Free(m_pJbig2Context->m_src_buf);
-                }
-                m_pJbig2Context->m_src_buf = NULL;
-                return FXCODEC_STATUS_ERROR;
-            }
-            delete m_pJbig2Context->m_dest_image;
-            FX_Free(m_pJbig2Context->m_src_buf);
-            return FXCODEC_STATUS_DECODE_FINISH;
-        } else {
-            CJBig2_Context::DestroyContext(m_pJbig2Context->m_pContext);
-            m_pJbig2Context->m_pContext = NULL;
-            if (ret != JBIG2_SUCCESS) {
-                return FXCODEC_STATUS_ERROR;
-            }
-            int dword_size = m_pJbig2Context->m_height * m_pJbig2Context->m_dest_pitch / 4;
-            FX_DWORD* dword_buf = (FX_DWORD*)m_pJbig2Context->m_dest_buf;
-            for (int i = 0; i < dword_size; i ++) {
-                dword_buf[i] = ~dword_buf[i];
+    if (m_pJbig2Context->m_pContext->GetProcessiveStatus() != FXCODEC_STATUS_DECODE_FINISH) {
+        return m_pJbig2Context->m_pContext->GetProcessiveStatus();
+    }
+    if (m_pJbig2Context->m_bFileReader) {
+        CJBig2_Context::DestroyContext(m_pJbig2Context->m_pContext);
+        m_pJbig2Context->m_pContext = NULL;
+        if (ret != JBIG2_SUCCESS) {
+            if(m_pJbig2Context->m_src_buf) {
+                FX_Free(m_pJbig2Context->m_src_buf);
             }
-            return FXCODEC_STATUS_DECODE_FINISH;
+            m_pJbig2Context->m_src_buf = NULL;
+            return FXCODEC_STATUS_ERROR;
         }
+        delete m_pJbig2Context->m_dest_image;
+        FX_Free(m_pJbig2Context->m_src_buf);
+        return FXCODEC_STATUS_DECODE_FINISH;
     }
-    return m_pJbig2Context->m_pContext->GetProcessiveStatus();
+    CJBig2_Context::DestroyContext(m_pJbig2Context->m_pContext);
+    m_pJbig2Context->m_pContext = NULL;
+    if (ret != JBIG2_SUCCESS) {
+        return FXCODEC_STATUS_ERROR;
+    }
+    int dword_size = m_pJbig2Context->m_height * m_pJbig2Context->m_dest_pitch / 4;
+    FX_DWORD* dword_buf = (FX_DWORD*)m_pJbig2Context->m_dest_buf;
+    for (int i = 0; i < dword_size; i ++) {
+        dword_buf[i] = ~dword_buf[i];
+    }
+    return FXCODEC_STATUS_DECODE_FINISH;
 }
 
 
diff --git a/core/src/fxcodec/codec/fx_codec_jpeg.cpp b/core/src/fxcodec/codec/fx_codec_jpeg.cpp
index 7666ac6083..b7d9fbe512 100644
--- a/core/src/fxcodec/codec/fx_codec_jpeg.cpp
+++ b/core/src/fxcodec/codec/fx_codec_jpeg.cpp
@@ -420,9 +420,11 @@ extern "C" {
         int ratio = (iratio_w > iratio_h) ? iratio_h : iratio_w;
         if (ratio >= 8) {
             return 8;
-        } else if (ratio >= 4) {
+        }
+        if (ratio >= 4) {
             return 4;
-        } else if (ratio >= 2) {
+        }
+        if (ratio >= 2) {
             return 2;
         }
         return 1;
-- 
cgit v1.2.3