diff options
-rw-r--r-- | core/fpdfapi/render/cpdf_dibsource.cpp | 6 | ||||
-rw-r--r-- | core/fpdfapi/render/cpdf_dibsource.h | 2 | ||||
-rw-r--r-- | core/fxge/ge/cfx_pathdata.cpp | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/core/fpdfapi/render/cpdf_dibsource.cpp b/core/fpdfapi/render/cpdf_dibsource.cpp index 3e00c8a23c..0b8c89551c 100644 --- a/core/fpdfapi/render/cpdf_dibsource.cpp +++ b/core/fpdfapi/render/cpdf_dibsource.cpp @@ -294,7 +294,7 @@ int CPDF_DIBSource::StartLoadDIBSource(CPDF_Document* pDoc, return 0; } if (m_bHasMask) { - StratLoadMask(); + StartLoadMask(); } return ret; } @@ -302,7 +302,7 @@ int CPDF_DIBSource::StartLoadDIBSource(CPDF_Document* pDoc, return 0; } if (m_bHasMask) { - ret = StratLoadMask(); + ret = StartLoadMask(); } if (ret == 2) { return ret; @@ -693,7 +693,7 @@ void CPDF_DIBSource::LoadJpxBitmap() { m_bpc = 8; } -int CPDF_DIBSource::StratLoadMask() { +int CPDF_DIBSource::StartLoadMask() { m_MatteColor = 0XFFFFFFFF; m_pMaskStream = m_pDict->GetStreamFor("SMask"); if (m_pMaskStream) { diff --git a/core/fpdfapi/render/cpdf_dibsource.h b/core/fpdfapi/render/cpdf_dibsource.h index f484f57d75..e9fc6c1132 100644 --- a/core/fpdfapi/render/cpdf_dibsource.h +++ b/core/fpdfapi/render/cpdf_dibsource.h @@ -69,7 +69,7 @@ class CPDF_DIBSource : public CFX_DIBSource { uint32_t GroupFamily = 0, bool bLoadMask = false); int ContinueLoadDIBSource(IFX_Pause* pPause); - int StratLoadMask(); + int StartLoadMask(); int StartLoadMaskDIB(); int ContinueLoadMaskDIB(IFX_Pause* pPause); int ContinueToLoadMask(); diff --git a/core/fxge/ge/cfx_pathdata.cpp b/core/fxge/ge/cfx_pathdata.cpp index 75e4faf0ef..6fae44acb1 100644 --- a/core/fxge/ge/cfx_pathdata.cpp +++ b/core/fxge/ge/cfx_pathdata.cpp @@ -343,14 +343,14 @@ bool CFX_PathData::GetZeroAreaPath(const CFX_Matrix* pMatrix, } } - int stratPoint = 0; + int startPoint = 0; int next = 0; for (size_t i = 0; i < m_Points.size(); i++) { FXPT_TYPE point_type = m_Points[i].m_Type; if (point_type == FXPT_TYPE::MoveTo) { - stratPoint = i; + startPoint = i; } else if (point_type == FXPT_TYPE::LineTo) { - next = (i + 1 - stratPoint) % (m_Points.size() - stratPoint) + stratPoint; + next = (i + 1 - startPoint) % (m_Points.size() - startPoint) + startPoint; if (m_Points[next].m_Type != FXPT_TYPE::BezierTo && m_Points[next].m_Type != FXPT_TYPE::MoveTo) { if ((m_Points[i - 1].m_Point.x == m_Points[i].m_Point.x && |