r19924 by craig - Fix indentation
scribus-commit
scribus-commit at lists.scribus.net
Sun Mar 15 12:55:01 UTC 2015
Author: craig
Date: Sun Mar 15 12:55:01 2015
New Revision: 19924
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19924
Log:
Fix indentation
Modified:
trunk/Scribus/scribus/util_math.cpp
Modified: trunk/Scribus/scribus/util_math.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19924&path=/trunk/Scribus/scribus/util_math.cpp
==============================================================================
--- trunk/Scribus/scribus/util_math.cpp (original)
+++ trunk/Scribus/scribus/util_math.cpp Sun Mar 15 12:55:01 2015
@@ -329,67 +329,67 @@
// Code adapted from Qt RectInRegion (cf. qregion.cpp) to detect
// if a specific rect is stricly contained in a specific region
const QRect *pbox, *pboxEnd;
- bool partIn(false), partOut(false);
+ bool partIn(false), partOut(false);
QRect *prect = ▭
int rx = rect.left();
int ry = rect.top();
-
+
int rectCount = shape.rectCount();
QRect boundingRect = shape.boundingRect();
- if (rectCount == 0 || !boundingRect.contains(rect))
- return false;
-
- /* can stop when both partOut and partIn are true, or we reach prect->y2 */
+ if (rectCount == 0 || !boundingRect.contains(rect))
+ return false;
+
+ /* can stop when both partOut and partIn are true, or we reach prect->y2 */
const QVector<QRect> rects = shape.rects();
- pbox = (rectCount == 1) ? &boundingRect : rects.constData();
- pboxEnd = pbox + rectCount;
- for (; pbox < pboxEnd; ++pbox) {
- if (pbox->bottom() < ry)
- continue;
-
- if (pbox->top() > ry) {
- partOut = true;
- if (partIn || pbox->top() > prect->bottom())
- break;
- ry = pbox->top();
- }
-
- if (pbox->right() < rx)
- continue; /* not far enough over yet */
-
- if (pbox->left() > rx) {
- partOut = true; /* missed part of rectangle to left */
- if (partIn)
- break;
- }
-
- if (pbox->left() <= prect->right()) {
- partIn = true; /* definitely overlap */
- if (partOut)
- break;
- }
-
- if (pbox->right() >= prect->right()) {
- ry = pbox->bottom() + 1; /* finished with this band */
- if (ry > prect->bottom())
- break;
- rx = prect->left(); /* reset x out to left again */
- } else {
- /*
- * Because boxes in a band are maximal width, if the first box
- * to overlap the rectangle doesn't completely cover it in that
- * band, the rectangle must be partially out, since some of it
- * will be uncovered in that band. partIn will have been set true
- * by now...
- */
- break;
- }
- }
+ pbox = (rectCount == 1) ? &boundingRect : rects.constData();
+ pboxEnd = pbox + rectCount;
+ for (; pbox < pboxEnd; ++pbox) {
+ if (pbox->bottom() < ry)
+ continue;
+
+ if (pbox->top() > ry) {
+ partOut = true;
+ if (partIn || pbox->top() > prect->bottom())
+ break;
+ ry = pbox->top();
+ }
+
+ if (pbox->right() < rx)
+ continue; /* not far enough over yet */
+
+ if (pbox->left() > rx) {
+ partOut = true; /* missed part of rectangle to left */
+ if (partIn)
+ break;
+ }
+
+ if (pbox->left() <= prect->right()) {
+ partIn = true; /* definitely overlap */
+ if (partOut)
+ break;
+ }
+
+ if (pbox->right() >= prect->right()) {
+ ry = pbox->bottom() + 1; /* finished with this band */
+ if (ry > prect->bottom())
+ break;
+ rx = prect->left(); /* reset x out to left again */
+ } else {
+ /*
+ * Because boxes in a band are maximal width, if the first box
+ * to overlap the rectangle doesn't completely cover it in that
+ * band, the rectangle must be partially out, since some of it
+ * will be uncovered in that band. partIn will have been set true
+ * by now...
+ */
+ break;
+ }
+ }
/*bool newResult = partIn ? ((ry <= prect->bottom()) ? false : true) : false;
if (oldResult != newResult)
int test = 0;*/
- return partIn ? ((ry <= prect->bottom()) ? false : true) : false;
+ return partIn ? ((ry <= prect->bottom()) ? false : true) : false;
}
QPolygon FlattenPath(const FPointArray& ina, QList<uint> &Segs)
More information about the scribus-commit
mailing list