diff options
author | Tom Sepez <tsepez@chromium.org> | 2015-07-22 15:14:14 -0700 |
---|---|---|
committer | Tom Sepez <tsepez@chromium.org> | 2015-07-22 15:14:14 -0700 |
commit | 3c012fef2bb72c8ec1faa73e11ee35539b2559d6 (patch) | |
tree | b88cb30a45a615b89cdb380f1f62d270ce540fb9 /core/src/fxcrt/fx_basic_array.cpp | |
parent | 4eb4d7f6c707cc2c23c806aa540d055c8832b55d (diff) | |
download | pdfium-3c012fef2bb72c8ec1faa73e11ee35539b2559d6.tar.xz |
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 .
Diffstat (limited to 'core/src/fxcrt/fx_basic_array.cpp')
-rw-r--r-- | core/src/fxcrt/fx_basic_array.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/src/fxcrt/fx_basic_array.cpp b/core/src/fxcrt/fx_basic_array.cpp index 56b2f57f3c..4ab34bb022 100644 --- a/core/src/fxcrt/fx_basic_array.cpp +++ b/core/src/fxcrt/fx_basic_array.cpp @@ -243,7 +243,8 @@ void** CFX_BaseSegmentedArray::GetIndex(int seg_index) const ASSERT(m_IndexDepth != 0); if (m_IndexDepth == 1) { return (void**)m_pIndex; - } else if (m_IndexDepth == 2) { + } + if (m_IndexDepth == 2) { return (void**)((void**)m_pIndex)[seg_index / m_IndexSize]; } int tree_size = 1; |