diff options
Diffstat (limited to 'core/src/fpdfapi/fpdf_page')
-rw-r--r-- | core/src/fpdfapi/fpdf_page/fpdf_page.cpp | 3 | ||||
-rw-r--r-- | core/src/fpdfapi/fpdf_page/fpdf_page_graph_state.cpp | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/core/src/fpdfapi/fpdf_page/fpdf_page.cpp b/core/src/fpdfapi/fpdf_page/fpdf_page.cpp index f05c4bea92..301fca8969 100644 --- a/core/src/fpdfapi/fpdf_page/fpdf_page.cpp +++ b/core/src/fpdfapi/fpdf_page/fpdf_page.cpp @@ -251,8 +251,7 @@ void CPDF_TextObject::CalcPositionData(FX_FLOAT* pTextAdvanceX, } m_pCharPos[i - 1] = curpos; } - FX_RECT char_rect; - pFont->GetCharBBox(charcode, char_rect, level); + FX_RECT char_rect = pFont->GetCharBBox(charcode, level); FX_FLOAT charwidth; if (!bVertWriting) { if (min_y > char_rect.top) { diff --git a/core/src/fpdfapi/fpdf_page/fpdf_page_graph_state.cpp b/core/src/fpdfapi/fpdf_page/fpdf_page_graph_state.cpp index 44492b1a54..a294d3bce7 100644 --- a/core/src/fpdfapi/fpdf_page/fpdf_page_graph_state.cpp +++ b/core/src/fpdfapi/fpdf_page/fpdf_page_graph_state.cpp @@ -123,10 +123,10 @@ CFX_FloatRect CPDF_ClipPath::GetClipBox() const { bLayerStarted = FALSE; } else { if (!bLayerStarted) { - layer_rect = pTextObj->GetBBox(NULL); + layer_rect = CFX_FloatRect(pTextObj->GetBBox(nullptr)); bLayerStarted = TRUE; } else { - layer_rect.Union(pTextObj->GetBBox(NULL)); + layer_rect.Union(CFX_FloatRect(pTextObj->GetBBox(nullptr))); } } } |