diff options
| author | Tom Sepez <tsepez@chromium.org> | 2018-09-24 17:55:00 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-09-24 17:55:00 +0000 |
| commit | fed6e124109f089a38e24e37b104d983231bee78 (patch) | |
| tree | 6c1aa45a97eb27c67611dbe7480bdbcd26710d14 /core/fpdfdoc | |
| parent | 97f4483de007c2ff248696f24d34634e0adbf894 (diff) | |
| download | pdfium-fed6e124109f089a38e24e37b104d983231bee78.tar.xz | |
Give CFX_GraphStateData a work-over.chromium/3561
Use std::vector<float> for dash array.
Use compiler-generated default operations.
Squeeze some enums.
Fix obvious logic botch in DashChanged().
Change-Id: If1d809cc46a3cf2db98a09a3f5a49d22138c0640
Reviewed-on: https://pdfium-review.googlesource.com/42613
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'core/fpdfdoc')
| -rw-r--r-- | core/fpdfdoc/cpdf_annot.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/core/fpdfdoc/cpdf_annot.cpp b/core/fpdfdoc/cpdf_annot.cpp index 961da82d37..89bcdee108 100644 --- a/core/fpdfdoc/cpdf_annot.cpp +++ b/core/fpdfdoc/cpdf_annot.cpp @@ -504,8 +504,7 @@ void CPDF_Annot::DrawBorder(CFX_RenderDevice* pDevice, if (dash_count % 2) { dash_count++; } - graph_state.m_DashArray = FX_Alloc(float, dash_count); - graph_state.m_DashCount = dash_count; + graph_state.m_DashArray.resize(dash_count); size_t i; for (i = 0; i < pDashArray->GetCount(); ++i) { graph_state.m_DashArray[i] = pDashArray->GetNumberAt(i); @@ -514,9 +513,7 @@ void CPDF_Annot::DrawBorder(CFX_RenderDevice* pDevice, graph_state.m_DashArray[i] = graph_state.m_DashArray[i - 1]; } } else { - graph_state.m_DashArray = FX_Alloc(float, 2); - graph_state.m_DashCount = 2; - graph_state.m_DashArray[0] = graph_state.m_DashArray[1] = 3 * 1.0f; + graph_state.m_DashArray = {3.0f, 3.0f}; } } |