2 files changed, 2 insertions, 3 deletions
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<TInfo> info(
-        reinterpret_cast<TInfo*>(m_infoStack.GetAt(topIndex)));
+    std::unique_ptr<TInfo> 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<TInfo*> m_infoStack;
   CAGG_Graphics* m_aggGraphics;
   friend class CAGG_Graphics;
 };