Do one assignment per line in CXFA_Rectangle.
Change-Id: I7dc41d1f8aa17ac3e6e94bca0316d83b8ac565ca
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/70912
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
diff --git a/xfa/fxfa/parser/cxfa_rectangle.cpp b/xfa/fxfa/parser/cxfa_rectangle.cpp
index 1ffead3..db53bfa 100644
--- a/xfa/fxfa/parser/cxfa_rectangle.cpp
+++ b/xfa/fxfa/parser/cxfa_rectangle.cpp
@@ -107,7 +107,8 @@
float vy = 1.0f;
float nx = 1.0f;
float ny = 1.0f;
- CFX_PointF cp1, cp2;
+ CFX_PointF cp1;
+ CFX_PointF cp2;
CXFA_Stroke* corner1 = strokes[i];
CXFA_Stroke* corner2 = strokes[(i + 2) % 8];
float fRadius1 = corner1->GetRadius();
@@ -121,41 +122,52 @@
case 0:
cp1 = rtWidget.TopLeft();
cp2 = rtWidget.TopRight();
- vx = 1, vy = 1;
- nx = -1, ny = 0;
+ vx = 1;
+ vy = 1;
+ nx = -1;
+ ny = 0;
if (bRound) {
sx = bInverted ? FX_PI / 2 : FX_PI;
} else {
- sx = 1, sy = 0;
+ sx = 1;
+ sy = 0;
}
break;
case 2:
cp1 = rtWidget.TopRight();
cp2 = rtWidget.BottomRight();
- vx = -1, vy = 1;
- nx = 0, ny = -1;
+ vx = -1;
+ vy = 1;
+ nx = 0;
+ ny = -1;
if (bRound) {
sx = bInverted ? FX_PI : FX_PI * 3 / 2;
} else {
- sx = 0, sy = 1;
+ sx = 0;
+ sy = 1;
}
break;
case 4:
cp1 = rtWidget.BottomRight();
cp2 = rtWidget.BottomLeft();
- vx = -1, vy = -1;
- nx = 1, ny = 0;
+ vx = -1;
+ vy = -1;
+ nx = 1;
+ ny = 0;
if (bRound) {
sx = bInverted ? FX_PI * 3 / 2 : 0;
} else {
- sx = -1, sy = 0;
+ sx = -1;
+ sy = 0;
}
break;
case 6:
cp1 = rtWidget.BottomLeft();
cp2 = rtWidget.TopLeft();
- vx = 1, vy = -1;
- nx = 0, ny = 1;
+ vx = 1;
+ vy = -1;
+ nx = 0;
+ ny = 1;
if (bRound) {
sx = bInverted ? 0 : FX_PI / 2;
} else {
@@ -498,17 +510,22 @@
cp2 = rtWidget.TopRight();
if (nIndex == 0) {
cpStart.x = cp1.x - halfBefore;
- cpStart.y = cp1.y + fRadius1, offsetY = -halfAfter;
+ cpStart.y = cp1.y + fRadius1;
+ offsetY = -halfAfter;
} else {
- cpStart.x = cp1.x + fRadius1 - halfBefore, cpStart.y = cp1.y,
+ cpStart.x = cp1.x + fRadius1 - halfBefore;
+ cpStart.y = cp1.y;
offsetEX = halfAfter;
}
- vx = 1, vy = 1;
- nx = -1, ny = 0;
+ vx = 1;
+ vy = 1;
+ nx = -1;
+ ny = 0;
if (bRound) {
sx = bInverted ? FX_PI / 2 : FX_PI;
} else {
- sx = 1, sy = 0;
+ sx = 1;
+ sy = 0;
}
break;
case 2:
@@ -516,18 +533,23 @@
cp1 = rtWidget.TopRight();
cp2 = rtWidget.BottomRight();
if (nIndex == 2) {
- cpStart.x = cp1.x - fRadius1, cpStart.y = cp1.y - halfBefore,
+ cpStart.x = cp1.x - fRadius1;
+ cpStart.y = cp1.y - halfBefore;
offsetX = halfAfter;
} else {
- cpStart.x = cp1.x, cpStart.y = cp1.y + fRadius1 - halfBefore,
+ cpStart.x = cp1.x;
+ cpStart.y = cp1.y + fRadius1 - halfBefore;
offsetEY = halfAfter;
}
- vx = -1, vy = 1;
- nx = 0, ny = -1;
+ vx = -1;
+ vy = 1;
+ nx = 0;
+ ny = -1;
if (bRound) {
sx = bInverted ? FX_PI : FX_PI * 3 / 2;
} else {
- sx = 0, sy = 1;
+ sx = 0;
+ sy = 1;
}
break;
case 4:
@@ -535,18 +557,23 @@
cp1 = rtWidget.BottomRight();
cp2 = rtWidget.BottomLeft();
if (nIndex == 4) {
- cpStart.x = cp1.x + halfBefore, cpStart.y = cp1.y - fRadius1,
+ cpStart.x = cp1.x + halfBefore;
+ cpStart.y = cp1.y - fRadius1;
offsetY = halfAfter;
} else {
- cpStart.x = cp1.x - fRadius1 + halfBefore, cpStart.y = cp1.y,
+ cpStart.x = cp1.x - fRadius1 + halfBefore;
+ cpStart.y = cp1.y;
offsetEX = -halfAfter;
}
- vx = -1, vy = -1;
- nx = 1, ny = 0;
+ vx = -1;
+ vy = -1;
+ nx = 1;
+ ny = 0;
if (bRound) {
sx = bInverted ? FX_PI * 3 / 2 : 0;
} else {
- sx = -1, sy = 0;
+ sx = -1;
+ sy = 0;
}
break;
case 6:
@@ -554,10 +581,12 @@
cp1 = rtWidget.BottomLeft();
cp2 = rtWidget.TopLeft();
if (nIndex == 6) {
- cpStart.x = cp1.x + fRadius1, cpStart.y = cp1.y + halfBefore,
+ cpStart.x = cp1.x + fRadius1;
+ cpStart.y = cp1.y + halfBefore;
offsetX = -halfAfter;
} else {
- cpStart.x = cp1.x, cpStart.y = cp1.y - fRadius1 + halfBefore,
+ cpStart.x = cp1.x;
+ cpStart.y = cp1.y - fRadius1 + halfBefore;
offsetEY = -halfAfter;
}
vx = 1;
