This is an automated email from the git hooks/post-receive script.
sebastic-guest pushed a commit to branch master
in repository qgis.
commit 9f37f4980907b29eae23e55681c2fb93f54ece8f
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date: Fri Jan 31 19:42:44 2014 +0100
Apply fixes from Peter Green to ARM patch.
---
debian/changelog | 7 +++++++
debian/patches/qgis_arm.patch | 19 ++++++++++++-------
2 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index e7d973d..ae13310 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+qgis (2.0.1-2) UNRELEASED; urgency=low
+
+ [ Peter Michael Green ]
+ * Fix broken ARM patch by Konstantinos Margaritis.
+
+ -- Bas Couwenberg <sebas...@xs4all.nl> Fri, 31 Jan 2014 19:42:03 +0100
+
qgis (2.0.1-1) unstable; urgency=low
[ Jürgen E. Fischer ]
diff --git a/debian/patches/qgis_arm.patch b/debian/patches/qgis_arm.patch
index e19ed0b..1dc106d 100644
--- a/debian/patches/qgis_arm.patch
+++ b/debian/patches/qgis_arm.patch
@@ -1,7 +1,10 @@
Description: 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
Author: Konstantinos Margaritis <konstantinos.margari...@freevec.org>
+Author: Peter Michael Green <plugw...@debian.org>
Bug-Debian: http://bugs.debian.org/691333
-Last-Update: 2014-01-17
+Last-Update: 2014-02-06
--- a/src/core/qgscoordinatetransform.h
+++ b/src/core/qgscoordinatetransform.h
@@ -154,6 +154,9 @@ class CORE_EXPORT QgsCoordinateTransform
@@ -35,8 +38,8 @@ Last-Update: 2014-01-17
+#ifdef QT_ARCH_ARM
+void QgsMapToPixel::transformInPlace( qreal& x, qreal& y ) const
+{
-+ double xd = (double) x, yd = (double) y;
-+ transformInPlace(xd, yd);
++ x = ( x - xMin ) / mMapUnitsPerPixel;
++ y = yMax - ( y - yMin ) / mMapUnitsPerPixel;
+}
+#endif
+
@@ -50,7 +53,7 @@ Last-Update: 2014-01-17
+
--- a/src/core/qgscoordinatetransform.cpp
+++ b/src/core/qgscoordinatetransform.cpp
-@@ -416,6 +416,15 @@ void QgsCoordinateTransform::transformIn
+@@ -388,6 +388,17 @@ void QgsCoordinateTransform::transformIn
}
}
@@ -60,9 +63,11 @@ Last-Update: 2014-01-17
+{
+ double xd = (double) x, yd = (double) y;
+ transformInPlace(xd, yd, z, direction);
++ x=xd;
++ y=yd;
+}
+#endif
+
- void QgsCoordinateTransform::transformInPlace(
- QVector<float>& x, QVector<float>& y, QVector<float>& z,
- TransformDirection direction ) const
+ #ifdef ANDROID
+ void QgsCoordinateTransform::transformInPlace( float& x, float& y, float& z,
+ TransformDirection direction ) const
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/qgis.git
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
