summaryrefslogtreecommitdiffstats
path: root/scribus
diff options
context:
space:
mode:
authorjghali <jghali@11d20701-8431-0410-a711-e3c959e3b870>2012-02-15 22:53:59 +0000
committerjghali <jghali@11d20701-8431-0410-a711-e3c959e3b870>2012-02-15 22:53:59 +0000
commit2c18e662795370cd124cd30b5bca171f2ab09d76 (patch)
treefded5df45898f543b7f8be6a50c7c809850cff06 /scribus
parent0548807b6720893c90b9e3b714bfa38a53236ef8 (diff)
downloadscribus-2c18e662795370cd124cd30b5bca171f2ab09d76.tar.gz
scribus-2c18e662795370cd124cd30b5bca171f2ab09d76.tar.xz
scribus-2c18e662795370cd124cd30b5bca171f2ab09d76.zip
fix for broken arm build patch
git-svn-id: svn://scribus.net/branches/Version14x/Scribus@17307 11d20701-8431-0410-a711-e3c959e3b870
Diffstat (limited to 'scribus')
-rw-r--r--scribus/pageitem.cpp12
1 files changed, 10 insertions, 2 deletions
diff --git a/scribus/pageitem.cpp b/scribus/pageitem.cpp
index 56a6451..7c2fffe 100644
--- a/scribus/pageitem.cpp
+++ b/scribus/pageitem.cpp
@@ -4829,7 +4829,11 @@ void PageItem::getBoundingRect(double *x1, double *y1, double *x2, double *y2) c
FPoint maxAr = getMaxClipF(&arrow);
totalRect = totalRect.united(QRectF(QPointF(minAr.x(), minAr.y()), QPointF(maxAr.x(), maxAr.y())));
}
- totalRect.getCoords((qreal*)x1, (qreal*)y1, (qreal*)x2, (qreal*)y2);
+
+ qreal rx1, ry1, rx2, ry2;
+ totalRect.getCoords(&rx1, &ry1, &rx2, &ry2);
+ *x1 = rx1; *y1 = ry1;
+ *x2 = rx2; *y2 = ry2;
}
void PageItem::getVisualBoundingRect(double * x1, double * y1, double * x2, double * y2) const
@@ -4989,7 +4993,11 @@ void PageItem::getVisualBoundingRect(double * x1, double * y1, double * x2, doub
FPoint maxAr = getMaxClipF(&arrow);
totalRect = totalRect.united(QRectF(QPointF(minAr.x(), minAr.y()), QPointF(maxAr.x(), maxAr.y())));
}
- totalRect.getCoords((qreal*)x1, (qreal*)y1, (qreal*)x2, (qreal*)y2);
+
+ qreal rx1, ry1, rx2, ry2;
+ totalRect.getCoords(&rx1, &ry1, &rx2, &ry2);
+ *x1 = rx1; *y1 = ry1;
+ *x2 = rx2; *y2 = ry2;
}
double PageItem::visualXPos() const