Merge pull request #1275 from sebastic/arm

jef-n · jef-n · commit c324895cc1d5 · 2014-03-28T12:06:32.000+01:00
Support building QGIS on ARM (#9917)
diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
@@ -55,6 +55,11 @@ IF(NOT ANDROID)
   SET(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} ANDROID)
 ENDIF(NOT ANDROID)
 
+IF(CMAKE_SYSTEM_PROCESSOR MATCHES "^arm")
+ELSE(CMAKE_SYSTEM_PROCESSOR MATCHES "^arm")
+  SET(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} ARM)
+ENDIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^arm")
+
 IF(NOT WITH_TOUCH)
   SET(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} HAVE_TOUCH)
 ENDIF(NOT WITH_TOUCH)
diff --git a/python/core/composer/qgscomposerscalebar.sip b/python/core/composer/qgscomposerscalebar.sip
@@ -109,7 +109,7 @@ class QgsComposerScaleBar: QgsComposerItem
      of the segment
      @note python bindings not available on android
      */
-%If (!ANDROID)
+%If (!ARM)
     void segmentPositions( QList<QPair<double, double> >& posWidthList ) const;
 %End
 
diff --git a/python/core/qgsclipper.sip b/python/core/qgsclipper.sip
@@ -1,3 +1,5 @@
+%Feature ARM
+
 class QgsClipper
 {
 %TypeHeaderCode
@@ -34,7 +36,7 @@ class QgsClipper
     // A handy way to refer to the four boundaries
     enum Boundary {XMax, XMin, YMax, YMin};
 
-%If (!ANDROID)
+%If (!ARM)
     // Trims the given feature to a rectangular box. Returns the trimmed
     // feature in x and y. The shapeOpen parameter determines whether
     // the function treats the points as a closed shape (polygon), or as
diff --git a/src/app/gps/qwtpolar-1.0/qwt_polar_curve.cpp b/src/app/gps/qwtpolar-1.0/qwt_polar_curve.cpp
@@ -433,7 +433,7 @@ void QwtPolarCurve::drawLines( QPainter *painter,
 
     if ( !clipRect.isEmpty() )
     {
-        double off = qCeil( qMax( 1.0, painter->pen().widthF() ) );
+        double off = qCeil( qMax((qreal)1.0,painter->pen().widthF() ) );
         clipRect = clipRect.toRect().adjusted( -off, -off, off, off );
         polyline = QwtClipper::clipPolygonF( clipRect, polyline );
     }
diff --git a/src/app/gps/qwtpolar-1.0/qwt_polar_layout.cpp b/src/app/gps/qwtpolar-1.0/qwt_polar_layout.cpp
@@ -278,7 +278,7 @@ QRectF QwtPolarLayout::layoutLegend( Options options, QRectF &rect ) const
         // We don't allow vertical legends to take more than
         // half of the available space.
 
-        dim = qMin( hint.width(), rect.width() * d_data->legendRatio );
+        dim = qMin( hint.width(), (qreal)(rect.width() * d_data->legendRatio) );
 
         if ( !( options & IgnoreScrollbars ) )
         {
@@ -293,7 +293,7 @@ QRectF QwtPolarLayout::layoutLegend( Options options, QRectF &rect ) const
     }
     else
     {
-        dim = qMin( hint.height(), rect.height() * d_data->legendRatio );
+        dim = qMin( hint.height(), (qreal)(rect.height() * d_data->legendRatio) );
         dim = qMax( dim, d_data->layoutData.legend.hScrollBarHeight );
     }
 
diff --git a/src/core/qgscoordinatetransform.cpp b/src/core/qgscoordinatetransform.cpp
@@ -434,6 +434,17 @@ void QgsCoordinateTransform::transformInPlace(
   }
 }
 
+#ifdef QT_ARCH_ARM
+void QgsCoordinateTransform::transformInPlace( qreal& x, qreal& y, double& z,
+    TransformDirection direction ) const
+{
+  double xd = (double) x, yd = (double) y;
+  transformInPlace(xd, yd, z, direction);
+  x=xd;
+  y=yd;
+}
+#endif
+
 #ifdef ANDROID
 void QgsCoordinateTransform::transformInPlace( float& x, float& y, float& z,
     TransformDirection direction ) const
diff --git a/src/core/qgscoordinatetransform.h b/src/core/qgscoordinatetransform.h
@@ -156,6 +156,9 @@ class CORE_EXPORT QgsCoordinateTransform : public QObject
     // and y variables in place. The second one works with good old-fashioned
     // C style arrays.
     void transformInPlace( double& x, double& y, double &z, TransformDirection direction = ForwardTransform ) const;
+#ifdef QT_ARCH_ARM
+    void transformInPlace( qreal& x, qreal& y, double &z, TransformDirection direction = ForwardTransform ) const;
+#endif
 
     //! @note not available in python bindings
     void transformInPlace( QVector<double>& x, QVector<double>& y, QVector<double>& z,
diff --git a/src/core/qgsmaptopixel.cpp b/src/core/qgsmaptopixel.cpp
@@ -138,6 +138,14 @@ void QgsMapToPixel::transformInPlace( double& x, double& y ) const
   y = yMax - ( y - yMin ) / mMapUnitsPerPixel;
 }
 
+#ifdef QT_ARCH_ARM
+void QgsMapToPixel::transformInPlace( qreal& x, qreal& y ) const
+{
+  x = ( x - xMin ) / mMapUnitsPerPixel;
+  y = yMax - ( y - yMin ) / mMapUnitsPerPixel;
+}
+#endif
+
 void QgsMapToPixel::transformInPlace( QVector<double>& x,
                                       QVector<double>& y ) const
 {
@@ -161,3 +169,4 @@ void QgsMapToPixel::transformInPlace( QVector<float>& x,
     transformInPlace( x[i], y[i] );
 }
 #endif
+
diff --git a/src/core/qgsmaptopixel.h b/src/core/qgsmaptopixel.h
@@ -66,6 +66,9 @@ class CORE_EXPORT QgsMapToPixel
        given coordinates in place. Intended as a fast way to do the
        transform. */
     void transformInPlace( double& x, double& y ) const;
+#ifdef QT_ARCH_ARM
+    void transformInPlace( qreal& x, qreal& y ) const;
+#endif
 
     /* Transform device coordinates to map coordinates. Modifies the
        given coordinates in place. Intended as a fast way to do the

Original file line number	Diff line number	Diff line change
`@@ -433,7 +433,7 @@ void QwtPolarCurve::drawLines( QPainter *painter,`
`433`	`433`
`434`	`434`	`if ( !clipRect.isEmpty() )`
`435`	`435`	`{`
`436`		`- double off = qCeil( qMax( 1.0, painter->pen().widthF() ) );`
	`436`	`+ double off = qCeil( qMax((qreal)1.0,painter->pen().widthF() ) );`
`437`	`437`	`clipRect = clipRect.toRect().adjusted( -off, -off, off, off );`
`438`	`438`	`polyline = QwtClipper::clipPolygonF( clipRect, polyline );`
`439`	`439`	`}`
Original file line number	Diff line number	Diff line change
`@@ -278,7 +278,7 @@ QRectF QwtPolarLayout::layoutLegend( Options options, QRectF &rect ) const`
`278`	`278`	`// We don't allow vertical legends to take more than`
`279`	`279`	`// half of the available space.`
`280`	`280`
`281`		`- dim = qMin( hint.width(), rect.width() * d_data->legendRatio );`
	`281`	`+ dim = qMin( hint.width(), (qreal)(rect.width() * d_data->legendRatio) );`
`282`	`282`
`283`	`283`	`if ( !( options & IgnoreScrollbars ) )`
`284`	`284`	`{`
`@@ -293,7 +293,7 @@ QRectF QwtPolarLayout::layoutLegend( Options options, QRectF &rect ) const`
`293`	`293`	`}`
`294`	`294`	`else`
`295`	`295`	`{`
`296`		`- dim = qMin( hint.height(), rect.height() * d_data->legendRatio );`
	`296`	`+ dim = qMin( hint.height(), (qreal)(rect.height() * d_data->legendRatio) );`
`297`	`297`	`dim = qMax( dim, d_data->layoutData.legend.hScrollBarHeight );`
`298`	`298`	`}`
`299`	`299`
Original file line number	Diff line number	Diff line change
`@@ -138,6 +138,14 @@ void QgsMapToPixel::transformInPlace( double& x, double& y ) const`
`138`	`138`	`y = yMax - ( y - yMin ) / mMapUnitsPerPixel;`
`139`	`139`	`}`
`140`	`140`
	`141`	`+#ifdef QT_ARCH_ARM`
	`142`	`+void QgsMapToPixel::transformInPlace( qreal& x, qreal& y ) const`
	`143`	`+{`
	`144`	`+ x = ( x - xMin ) / mMapUnitsPerPixel;`
	`145`	`+ y = yMax - ( y - yMin ) / mMapUnitsPerPixel;`
	`146`	`+}`
	`147`	`+#endif`
	`148`	`+`
`141`	`149`	`void QgsMapToPixel::transformInPlace( QVector<double>& x,`
`142`	`150`	`QVector<double>& y ) const`
`143`	`151`	`{`
`@@ -161,3 +169,4 @@ void QgsMapToPixel::transformInPlace( QVector<float>& x,`
`161`	`169`	`transformInPlace( x[i], y[i] );`
`162`	`170`	`}`
`163`	`171`	`#endif`
	`172`	`+`