From bb0d446df18ee34504a165f3fc96fbb81b274f31 Mon Sep 17 00:00:00 2001 From: tsepez Date: Wed, 27 Apr 2016 16:59:30 -0700 Subject: Replace CFX_PtrArray with typesafe CFX_ArrayTemplate<>, part 3 Review-Url: https://codereview.chromium.org/1924093003 --- xfa/fxgraphics/cfx_graphics.cpp | 3 +-- xfa/fxgraphics/include/cfx_graphics.h | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'xfa/fxgraphics') diff --git a/xfa/fxgraphics/cfx_graphics.cpp b/xfa/fxgraphics/cfx_graphics.cpp index 82017f49a0..fd85714254 100644 --- a/xfa/fxgraphics/cfx_graphics.cpp +++ b/xfa/fxgraphics/cfx_graphics.cpp @@ -644,8 +644,7 @@ FX_ERR CFX_Graphics::RestoreGraphState() { return FX_ERR_Intermediate_Value_Invalid; } int32_t topIndex = size - 1; - std::unique_ptr info( - reinterpret_cast(m_infoStack.GetAt(topIndex))); + std::unique_ptr info(m_infoStack.GetAt(topIndex)); if (!info) return FX_ERR_Intermediate_Value_Invalid; m_info = *info; diff --git a/xfa/fxgraphics/include/cfx_graphics.h b/xfa/fxgraphics/include/cfx_graphics.h index 1438acb7f4..7f456270a5 100644 --- a/xfa/fxgraphics/include/cfx_graphics.h +++ b/xfa/fxgraphics/include/cfx_graphics.h @@ -245,7 +245,7 @@ class CFX_Graphics { CFX_RectF& rect); CFX_RenderDevice* m_renderDevice; - CFX_PtrArray m_infoStack; + CFX_ArrayTemplate m_infoStack; CAGG_Graphics* m_aggGraphics; friend class CAGG_Graphics; }; -- cgit v1.2.3