summaryrefslogtreecommitdiff
path: root/xfa/fxgraphics
diff options
context:
space:
mode:
authortsepez <tsepez@chromium.org>2016-04-27 16:59:30 -0700
committerCommit bot <commit-bot@chromium.org>2016-04-27 16:59:30 -0700
commitbb0d446df18ee34504a165f3fc96fbb81b274f31 (patch)
tree9c2615b4c8a8d597f22e8504c23e2fdbf1df4de5 /xfa/fxgraphics
parentdf96690d4e3799536b981e3673d64018fa5fd037 (diff)
downloadpdfium-bb0d446df18ee34504a165f3fc96fbb81b274f31.tar.xz
Replace CFX_PtrArray with typesafe CFX_ArrayTemplate<>, part 3
Review-Url: https://codereview.chromium.org/1924093003
Diffstat (limited to 'xfa/fxgraphics')
-rw-r--r--xfa/fxgraphics/cfx_graphics.cpp3
-rw-r--r--xfa/fxgraphics/include/cfx_graphics.h2
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;
};