[QGIS Commit] [qgis/QGIS] 03b028: On armel/armhf qreal is typedef'ed to float not do...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qgis/QGIS
  Commit: 03b028dbf7c66949a1365cb6a927874c1318840e
      https://github.com/qgis/QGIS/commit/03b028dbf7c66949a1365cb6a927874c1318840e
  Author: Bas Couwenberg <sebastic at xs4all.nl>
  Date:   2014-03-28 (Fri, 28 Mar 2014)

  Changed paths:
    M src/core/qgscoordinatetransform.cpp
    M src/core/qgscoordinatetransform.h
    M src/core/qgsmaptopixel.cpp
    M src/core/qgsmaptopixel.h

  Log Message:
  -----------
  On armel/armhf qreal is typedef'ed to float not double.

This patch adds qreal versions of some functions on arm. It was originally
writen by Konstantinos Margaritis and later fixed by Peter Michael Green.

Bug-Debian: http://bugs.debian.org/691333


  Commit: 7db6ae54124a2f2213c0609490904653c6c798af
      https://github.com/qgis/QGIS/commit/7db6ae54124a2f2213c0609490904653c6c798af
  Author: Bas Couwenberg <sebastic at xs4all.nl>
  Date:   2014-03-28 (Fri, 28 Mar 2014)

  Changed paths:
    M src/app/gps/qwtpolar-1.0/qwt_polar_curve.cpp
    M src/app/gps/qwtpolar-1.0/qwt_polar_layout.cpp

  Log Message:
  -----------
  Fix qreal vs double.

In qt4 on arm architectures qreal is defined as float while on other
architectures it is defined as double. This can cause problems if qreal
and double are carelessly mixed.

In this particular case the problem is that qMin/qMax are templates defined
to take two parameters of the same type. If two different types are passed
in then C++ can't resolve what type the template parameter should be and
bails out. The fix is simple, typecast one of the parameters so they
match.

Author: Peter Michael Green <plugwash at debian.org>
Bug-Debian: http://bugs.debian.org/737814


  Commit: 3d44c5934aba0c4a1e0919549f50f1650140de57
      https://github.com/qgis/QGIS/commit/3d44c5934aba0c4a1e0919549f50f1650140de57
  Author: Bas Couwenberg <sebastic at xs4all.nl>
  Date:   2014-03-28 (Fri, 28 Mar 2014)

  Changed paths:
    M python/CMakeLists.txt
    M python/core/composer/qgscomposerscalebar.sip
    M python/core/qgsclipper.sip

  Log Message:
  -----------
  Disable features on ARM.

Building QGIS on ARM produces the error:

sip: qgis/python/core/qgsclipper.sip:44: \
QgsClipper::trimFeature() unsupported function argument type - provide %MethodCode and a C++ signature

For the Android builds this was fixed in commit 2cc684793ceb29d8600d71564fb38f92c998f588.

This patch adapts the Android fix, by disabling the SIP features on all ARM systems.

Bug-Debian: http://bugs.debian.org/737814


  Commit: c324895cc1d58d60cf02d6d1f65ee2c4a3ec41d6
      https://github.com/qgis/QGIS/commit/c324895cc1d58d60cf02d6d1f65ee2c4a3ec41d6
  Author: Jürgen Fischer <jef at norbit.de>
  Date:   2014-03-28 (Fri, 28 Mar 2014)

  Changed paths:
    M python/CMakeLists.txt
    M python/core/composer/qgscomposerscalebar.sip
    M python/core/qgsclipper.sip
    M src/app/gps/qwtpolar-1.0/qwt_polar_curve.cpp
    M src/app/gps/qwtpolar-1.0/qwt_polar_layout.cpp
    M src/core/qgscoordinatetransform.cpp
    M src/core/qgscoordinatetransform.h
    M src/core/qgsmaptopixel.cpp
    M src/core/qgsmaptopixel.h

  Log Message:
  -----------
  Merge pull request #1275 from sebastic/arm

Support building QGIS on ARM (#9917)


Compare: https://github.com/qgis/QGIS/compare/a82aeb030c36...c324895cc1d5