diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-08-05 12:34:06 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-08-05 12:34:06 -0700 |
| commit | ae51c810a44844ef437393c1768be8f7766586b2 (patch) | |
| tree | 373bbfa8c8720af43d58a9982beea3ebf10c5d6d /xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.cpp | |
| parent | e3166a8c39c8943f6cafb2ffe10bd9564e3eaf16 (diff) | |
| download | pdfium-ae51c810a44844ef437393c1768be8f7766586b2.tar.xz | |
Kill off last uses of FX_NEW in XFA.
It would seem that this never merged completely.
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1277583002 .
Diffstat (limited to 'xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.cpp')
| -rw-r--r-- | xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.cpp index 0801bbcd11..8aef43f989 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.cpp @@ -61,14 +61,14 @@ CBC_BoundingBox* CBC_BoundingBox::merge(CBC_BoundingBox* leftBox, int32_t& e) {
CBC_BoundingBox* boundingBox = NULL;
if (leftBox == NULL) {
- boundingBox = FX_NEW CBC_BoundingBox(rightBox);
+ boundingBox = new CBC_BoundingBox(rightBox);
return boundingBox;
}
if (rightBox == NULL) {
- boundingBox = FX_NEW CBC_BoundingBox(leftBox);
+ boundingBox = new CBC_BoundingBox(leftBox);
return boundingBox;
}
- boundingBox = FX_NEW CBC_BoundingBox(
+ boundingBox = new CBC_BoundingBox(
leftBox->m_image, leftBox->m_topLeft, leftBox->m_bottomLeft,
rightBox->m_topRight, rightBox->m_bottomRight, e);
BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
@@ -90,7 +90,7 @@ CBC_BoundingBox* CBC_BoundingBox::addMissingRows(int32_t missingStartRows, if (newMinY < 0) {
newMinY = 0;
}
- newTop = FX_NEW CBC_ResultPoint((FX_FLOAT)top->GetX(), (FX_FLOAT)newMinY);
+ newTop = new CBC_ResultPoint((FX_FLOAT)top->GetX(), (FX_FLOAT)newMinY);
if (isLeft) {
newTopLeft = newTop;
} else {
@@ -104,7 +104,7 @@ CBC_BoundingBox* CBC_BoundingBox::addMissingRows(int32_t missingStartRows, newMaxY = m_image->GetHeight() - 1;
}
newBottom =
- FX_NEW CBC_ResultPoint((FX_FLOAT)bottom->GetX(), (FX_FLOAT)newMaxY);
+ new CBC_ResultPoint((FX_FLOAT)bottom->GetX(), (FX_FLOAT)newMaxY);
if (isLeft) {
newBottomLeft = newBottom;
} else {
@@ -112,7 +112,7 @@ CBC_BoundingBox* CBC_BoundingBox::addMissingRows(int32_t missingStartRows, }
}
calculateMinMaxValues();
- CBC_BoundingBox* boundingBox = FX_NEW CBC_BoundingBox(
+ CBC_BoundingBox* boundingBox = new CBC_BoundingBox(
m_image, newTopLeft, newBottomLeft, newTopRight, newBottomRight, e);
delete newTop;
delete newBottom;
@@ -123,7 +123,7 @@ void CBC_BoundingBox::setTopRight(CBC_ResultPoint topRight) { if (m_topRight) {
delete m_topRight;
}
- m_topRight = FX_NEW CBC_ResultPoint(topRight.GetX(), topRight.GetY());
+ m_topRight = new CBC_ResultPoint(topRight.GetX(), topRight.GetY());
calculateMinMaxValues();
}
void CBC_BoundingBox::setBottomRight(CBC_ResultPoint bottomRight) {
@@ -131,7 +131,7 @@ void CBC_BoundingBox::setBottomRight(CBC_ResultPoint bottomRight) { delete m_bottomRight;
}
m_bottomRight =
- FX_NEW CBC_ResultPoint(bottomRight.GetX(), bottomRight.GetY());
+ new CBC_ResultPoint(bottomRight.GetX(), bottomRight.GetY());
calculateMinMaxValues();
}
int32_t CBC_BoundingBox::getMinX() {
@@ -169,29 +169,29 @@ void CBC_BoundingBox::init(CBC_CommonBitMatrix* image, m_bottomRight = NULL;
m_image = image;
if (topLeft) {
- m_topLeft = FX_NEW CBC_ResultPoint(topLeft->GetX(), topLeft->GetY());
+ m_topLeft = new CBC_ResultPoint(topLeft->GetX(), topLeft->GetY());
}
if (bottomLeft) {
m_bottomLeft =
- FX_NEW CBC_ResultPoint(bottomLeft->GetX(), bottomLeft->GetY());
+ new CBC_ResultPoint(bottomLeft->GetX(), bottomLeft->GetY());
}
if (topRight) {
- m_topRight = FX_NEW CBC_ResultPoint(topRight->GetX(), topRight->GetY());
+ m_topRight = new CBC_ResultPoint(topRight->GetX(), topRight->GetY());
}
if (bottomRight) {
m_bottomRight =
- FX_NEW CBC_ResultPoint(bottomRight->GetX(), bottomRight->GetY());
+ new CBC_ResultPoint(bottomRight->GetX(), bottomRight->GetY());
}
calculateMinMaxValues();
}
void CBC_BoundingBox::calculateMinMaxValues() {
if (m_topLeft == NULL) {
- m_topLeft = FX_NEW CBC_ResultPoint(0, m_topRight->GetY());
- m_bottomLeft = FX_NEW CBC_ResultPoint(0, m_bottomRight->GetY());
+ m_topLeft = new CBC_ResultPoint(0, m_topRight->GetY());
+ m_bottomLeft = new CBC_ResultPoint(0, m_bottomRight->GetY());
} else if (m_topRight == NULL) {
- m_topRight = FX_NEW CBC_ResultPoint((FX_FLOAT)m_image->GetWidth() - 1,
+ m_topRight = new CBC_ResultPoint((FX_FLOAT)m_image->GetWidth() - 1,
(FX_FLOAT)m_topLeft->GetY());
- m_bottomRight = FX_NEW CBC_ResultPoint((FX_FLOAT)m_image->GetWidth() - 1,
+ m_bottomRight = new CBC_ResultPoint((FX_FLOAT)m_image->GetWidth() - 1,
(FX_FLOAT)m_bottomLeft->GetY());
}
m_minX = (int32_t)(m_topLeft->GetX() < m_bottomLeft->GetX()
|