diff options
author | Nico Weber <thakis@chromium.org> | 2015-08-06 15:08:57 -0700 |
---|---|---|
committer | Nico Weber <thakis@chromium.org> | 2015-08-06 15:08:57 -0700 |
commit | 077f1a335560a8014e466c768c1e9d24c8a61ac9 (patch) | |
tree | 8d080d5e2fbef32e5d945129eb19ff9909b192f5 /xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.cpp | |
parent | 792d55cfe3cf046125fd69d8914ae459216a68ab (diff) | |
download | pdfium-077f1a335560a8014e466c768c1e9d24c8a61ac9.tar.xz |
XFA: clang-format all pdfium code, again.
Also add a presubmit that checks for this so I don't have to keep doing it.
No behavior change.
Generated by:
find . -name '*.cpp' -o -name '*.h' | \
grep -E -v 'third_party|thirdparties|lpng_v163|tiff_v403' | \
xargs ../../buildtools/mac/clang-format -i
Then manually merged https://codereview.chromium.org/1269223002/
See thread "tabs vs spaces" on pdfium@googlegroups.com for discussion.
BUG=none
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1277043002 .
Diffstat (limited to 'xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.cpp')
-rw-r--r-- | xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.cpp | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.cpp index 8aef43f989..c1a7394103 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.cpp @@ -68,9 +68,9 @@ CBC_BoundingBox* CBC_BoundingBox::merge(CBC_BoundingBox* leftBox, boundingBox = new CBC_BoundingBox(leftBox);
return boundingBox;
}
- boundingBox = new CBC_BoundingBox(
- leftBox->m_image, leftBox->m_topLeft, leftBox->m_bottomLeft,
- rightBox->m_topRight, rightBox->m_bottomRight, e);
+ 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);
return boundingBox;
}
@@ -130,8 +130,7 @@ void CBC_BoundingBox::setBottomRight(CBC_ResultPoint bottomRight) { if (m_bottomRight) {
delete m_bottomRight;
}
- m_bottomRight =
- new CBC_ResultPoint(bottomRight.GetX(), bottomRight.GetY());
+ m_bottomRight = new CBC_ResultPoint(bottomRight.GetX(), bottomRight.GetY());
calculateMinMaxValues();
}
int32_t CBC_BoundingBox::getMinX() {
@@ -172,8 +171,7 @@ void CBC_BoundingBox::init(CBC_CommonBitMatrix* image, m_topLeft = new CBC_ResultPoint(topLeft->GetX(), topLeft->GetY());
}
if (bottomLeft) {
- m_bottomLeft =
- new CBC_ResultPoint(bottomLeft->GetX(), bottomLeft->GetY());
+ m_bottomLeft = new CBC_ResultPoint(bottomLeft->GetX(), bottomLeft->GetY());
}
if (topRight) {
m_topRight = new CBC_ResultPoint(topRight->GetX(), topRight->GetY());
@@ -190,9 +188,9 @@ void CBC_BoundingBox::calculateMinMaxValues() { m_bottomLeft = new CBC_ResultPoint(0, m_bottomRight->GetY());
} else if (m_topRight == NULL) {
m_topRight = new CBC_ResultPoint((FX_FLOAT)m_image->GetWidth() - 1,
- (FX_FLOAT)m_topLeft->GetY());
+ (FX_FLOAT)m_topLeft->GetY());
m_bottomRight = new CBC_ResultPoint((FX_FLOAT)m_image->GetWidth() - 1,
- (FX_FLOAT)m_bottomLeft->GetY());
+ (FX_FLOAT)m_bottomLeft->GetY());
}
m_minX = (int32_t)(m_topLeft->GetX() < m_bottomLeft->GetX()
? m_topLeft->GetX()
|