1 files changed, 7 insertions, 9 deletions
diff --git a/xfa/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.cpp b/xfa/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.cpp
index 47255fac71..a9d1fedef0 100644
--- a/xfa/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.cpp
+++ b/xfa/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.cpp
@@ -36,14 +36,13 @@ CBC_BarcodeMatrix::CBC_BarcodeMatrix(int32_t height, int32_t width) {
   m_outWidth = 0;
 }
 CBC_BarcodeMatrix::~CBC_BarcodeMatrix() {
-  for (int32_t i = 0; i < m_matrix.GetSize(); i++) {
-    delete (CBC_BarcodeRow*)m_matrix.GetAt(i);
-  }
-  m_matrix.RemoveAll();
+  for (int32_t i = 0; i < m_matrix.GetSize(); i++)
+    delete m_matrix.GetAt(i);
+
   m_matrixOut.RemoveAll();
 }
 void CBC_BarcodeMatrix::set(int32_t x, int32_t y, uint8_t value) {
-  ((CBC_BarcodeRow*)m_matrix[y])->set(x, value);
+  m_matrix[y]->set(x, value);
 }
 void CBC_BarcodeMatrix::setMatrix(int32_t x, int32_t y, FX_BOOL black) {
   set(x, y, (uint8_t)(black ? 1 : 0));
@@ -52,7 +51,7 @@ void CBC_BarcodeMatrix::startRow() {
   ++m_currentRow;
 }
 CBC_BarcodeRow* CBC_BarcodeMatrix::getCurrentRow() {
-  return (CBC_BarcodeRow*)m_matrix[m_currentRow];
+  return m_matrix[m_currentRow];
 }
 int32_t CBC_BarcodeMatrix::getWidth() {
   return m_outWidth;
@@ -70,7 +69,7 @@ CFX_ByteArray& CBC_BarcodeMatrix::getScaledMatrix(int32_t xScale,
                                                   int32_t yScale) {
   int32_t yMax = m_height * yScale;
   CFX_ByteArray bytearray;
-  bytearray.Copy(((CBC_BarcodeRow*)m_matrix[0])->getScaledRow(xScale));
+  bytearray.Copy(m_matrix[0]->getScaledRow(xScale));
   int32_t xMax = bytearray.GetSize();
   m_matrixOut.SetSize(xMax * yMax);
   m_outWidth = xMax;
@@ -78,8 +77,7 @@ CFX_ByteArray& CBC_BarcodeMatrix::getScaledMatrix(int32_t xScale,
   int32_t k = 0;
   for (int32_t i = 0; i < yMax; i++) {
     if (i != 0) {
-      bytearray.Copy(
-          ((CBC_BarcodeRow*)m_matrix[i / yScale])->getScaledRow(xScale));
+      bytearray.Copy(m_matrix[i / yScale]->getScaledRow(xScale));
     }
     k = i * xMax;
     for (int32_t l = 0; l < xMax; l++) {