From 4eb4d7f6c707cc2c23c806aa540d055c8832b55d Mon Sep 17 00:00:00 2001
From: Tom Sepez <tsepez@chromium.org>
Date: Wed, 22 Jul 2015 15:04:26 -0700
Subject: Revert "Fix else-after-returns throughout pdfium."

This reverts commit 7cc97521db1e52d5927f5605de5f9a7102f8af40.
---
 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, 29 insertions(+), 31 deletions(-)

(limited to 'core/src/fxcodec/codec')

diff --git a/core/src/fxcodec/codec/fx_codec_icc.cpp b/core/src/fxcodec/codec/fx_codec_icc.cpp
index 7507fe5d6d..da503c03fd 100644
--- a/core/src/fxcodec/codec/fx_codec_icc.cpp
+++ b/core/src/fxcodec/codec/fx_codec_icc.cpp
@@ -44,8 +44,7 @@ FX_BOOL CheckComponents(cmsColorSpaceSignature cs, int nComponents, FX_BOOL bDst
         case cmsSigGrayData:
             if (bDst && nComponents != 1) {
                 return FALSE;
-            }
-            if (!bDst && nComponents > 2) {
+            } else 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 51184306eb..7a69a24d40 100644
--- a/core/src/fxcodec/codec/fx_codec_jbig.cpp
+++ b/core/src/fxcodec/codec/fx_codec_jbig.cpp
@@ -172,34 +172,35 @@ 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) {
-        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);
+    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;
             }
-            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];
+            }
+            return FXCODEC_STATUS_DECODE_FINISH;
         }
-        delete m_pJbig2Context->m_dest_image;
-        FX_Free(m_pJbig2Context->m_src_buf);
-        return FXCODEC_STATUS_DECODE_FINISH;
     }
-    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;
+    return m_pJbig2Context->m_pContext->GetProcessiveStatus();
 }
 
 
diff --git a/core/src/fxcodec/codec/fx_codec_jpeg.cpp b/core/src/fxcodec/codec/fx_codec_jpeg.cpp
index b7d9fbe512..7666ac6083 100644
--- a/core/src/fxcodec/codec/fx_codec_jpeg.cpp
+++ b/core/src/fxcodec/codec/fx_codec_jpeg.cpp
@@ -420,11 +420,9 @@ extern "C" {
         int ratio = (iratio_w > iratio_h) ? iratio_h : iratio_w;
         if (ratio >= 8) {
             return 8;
-        }
-        if (ratio >= 4) {
+        } else if (ratio >= 4) {
             return 4;
-        }
-        if (ratio >= 2) {
+        } else if (ratio >= 2) {
             return 2;
         }
         return 1;
-- 
cgit v1.2.3