summaryrefslogtreecommitdiff
path: root/core/src/fxcrt
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2015-07-23 14:42:09 -0700
committerTom Sepez <tsepez@chromium.org>2015-07-23 14:42:09 -0700
commit2f2ffece124e4ed4b96d2846263015d4b5ad6c00 (patch)
tree6966e44279e8d9e1516b7c71219cf66f77a89ca2 /core/src/fxcrt
parentd07958fd2d1c4134d865f4ccb056eb925aaa7d2a (diff)
downloadpdfium-2f2ffece124e4ed4b96d2846263015d4b5ad6c00.tar.xz
Merge to XFA - else after returns.
(cherry picked from commit 3c012fef2bb72c8ec1faa73e11ee35539b2559d6) Original Review URL: https://codereview.chromium.org/1243953004 . R=thestig@chromium.org Review URL: https://codereview.chromium.org/1239313005 .
Diffstat (limited to 'core/src/fxcrt')
-rw-r--r--core/src/fxcrt/fx_basic_array.cpp3
-rw-r--r--core/src/fxcrt/fx_basic_bstring.cpp11
-rw-r--r--core/src/fxcrt/fx_basic_util.cpp24
-rw-r--r--core/src/fxcrt/fx_basic_wstring.cpp9
4 files changed, 26 insertions, 21 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;
diff --git a/core/src/fxcrt/fx_basic_bstring.cpp b/core/src/fxcrt/fx_basic_bstring.cpp
index 9f54414110..5eeb33b049 100644
--- a/core/src/fxcrt/fx_basic_bstring.cpp
+++ b/core/src/fxcrt/fx_basic_bstring.cpp
@@ -132,10 +132,9 @@ CFX_ByteString::CFX_ByteString(const CFX_ByteStringC& stringSrc)
if (stringSrc.IsEmpty()) {
m_pData = NULL;
return;
- } else {
- m_pData = NULL;
- *this = stringSrc;
}
+ m_pData = NULL;
+ *this = stringSrc;
}
CFX_ByteString::CFX_ByteString(const CFX_ByteStringC& str1, const CFX_ByteStringC& str2)
{
@@ -971,13 +970,15 @@ int CFX_ByteString::Compare(const CFX_ByteStringC& str) const
for (int i = 0; i < min_len; i ++) {
if ((uint8_t)m_pData->m_String[i] < str.GetAt(i)) {
return -1;
- } else if ((uint8_t)m_pData->m_String[i] > str.GetAt(i)) {
+ }
+ if ((uint8_t)m_pData->m_String[i] > str.GetAt(i)) {
return 1;
}
}
if (this_len < that_len) {
return -1;
- } else if (this_len > that_len) {
+ }
+ if (this_len > that_len) {
return 1;
}
return 0;
diff --git a/core/src/fxcrt/fx_basic_util.cpp b/core/src/fxcrt/fx_basic_util.cpp
index 952ea87df3..fa1f6ea3ed 100644
--- a/core/src/fxcrt/fx_basic_util.cpp
+++ b/core/src/fxcrt/fx_basic_util.cpp
@@ -466,18 +466,18 @@ CFX_Matrix_3by3 CFX_Matrix_3by3::Inverse()
FX_FLOAT det = a*(e*i - f*h) - b*(i*d - f*g) + c*(d*h - e*g);
if (FXSYS_fabs(det) < 0.0000001)
return CFX_Matrix_3by3();
- else
- return CFX_Matrix_3by3(
- (e*i - f*h) / det,
- -(b*i - c*h) / det,
- (b*f - c*e) / det,
- -(d*i - f*g) / det,
- (a*i - c*g) / det,
- -(a*f - c*d) / det,
- (d*h - e*g) / det,
- -(a*h - b*g) / det,
- (a*e - b*d) / det
- );
+
+ return CFX_Matrix_3by3(
+ (e*i - f*h) / det,
+ -(b*i - c*h) / det,
+ (b*f - c*e) / det,
+ -(d*i - f*g) / det,
+ (a*i - c*g) / det,
+ -(a*f - c*d) / det,
+ (d*h - e*g) / det,
+ -(a*h - b*g) / det,
+ (a*e - b*d) / det
+ );
}
CFX_Matrix_3by3 CFX_Matrix_3by3::Multiply(const CFX_Matrix_3by3 &m)
diff --git a/core/src/fxcrt/fx_basic_wstring.cpp b/core/src/fxcrt/fx_basic_wstring.cpp
index 2442daed27..b6b595588d 100644
--- a/core/src/fxcrt/fx_basic_wstring.cpp
+++ b/core/src/fxcrt/fx_basic_wstring.cpp
@@ -485,7 +485,8 @@ int CFX_WideString::Compare(const CFX_WideString& str) const
return 0;
}
return -1;
- } else if (str.m_pData == NULL) {
+ }
+ if (str.m_pData == NULL) {
return 1;
}
int this_len = m_pData->m_nDataLength;
@@ -494,13 +495,15 @@ int CFX_WideString::Compare(const CFX_WideString& str) const
for (int i = 0; i < min_len; i ++) {
if (m_pData->m_String[i] < str.m_pData->m_String[i]) {
return -1;
- } else if (m_pData->m_String[i] > str.m_pData->m_String[i]) {
+ }
+ if (m_pData->m_String[i] > str.m_pData->m_String[i]) {
return 1;
}
}
if (this_len < that_len) {
return -1;
- } else if (this_len > that_len) {
+ }
+ if (this_len > that_len) {
return 1;
}
return 0;