r17307 by jghali - fix for broken arm build patch

scribus-commit scribus-commit at lists.scribus.net
Wed Feb 15 22:53:59 UTC 2012


Author: jghali
Date: Wed Feb 15 22:53:59 2012
New Revision: 17307

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=17307
Log:
fix for broken arm build patch

Modified:
    branches/Version14x/Scribus/scribus/pageitem.cpp

Modified: branches/Version14x/Scribus/scribus/pageitem.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17307&path=/branches/Version14x/Scribus/scribus/pageitem.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/pageitem.cpp (original)
+++ branches/Version14x/Scribus/scribus/pageitem.cpp Wed Feb 15 22:53:59 2012
@@ -4829,7 +4829,11 @@
 		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 @@
 		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




More information about the scribus-commit mailing list