Committed upstream.

diff --git a/packaging/debian/patches/globe-projection-rangecheck.diff b/packaging/debian/patches/globe-projection-rangecheck.diff
deleted file mode 100644 (file)
index 2de01cd..0000000
--- a/packaging/debian/patches/globe-projection-rangecheck.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: tmp.BqMy4aY8YI/src/lib/ScanlineTextureMapperContext.cpp
-===================================================================
---- tmp.BqMy4aY8YI.orig/src/lib/ScanlineTextureMapperContext.cpp       2011-06-07 22:40:08.000000000 +0200
-+++ tmp.BqMy4aY8YI/src/lib/ScanlineTextureMapperContext.cpp    2011-06-07 22:40:18.000000000 +0200
-@@ -176,8 +176,8 @@
-                     nextTile( posX, posY );
-                     itLon = prevPixelX + m_toTileCoordinatesLon;
-                     itLat = prevPixelY + m_toTileCoordinatesLat;
--                    posX = itLon + itStepLon * j;
--                    posY = itLat + itStepLat * j;
-+                    posX = qMax<qreal>( 0.0, qMin<qreal>( tileWidth-1.0, itLon + itStepLon * j ) );
-+                    posY = qMax<qreal>( 0.0, qMin<qreal>( tileHeight-1.0, itLat + itStepLat * j ) );
-                     oldPosX = -1;
-                 }
- 

diff --git a/packaging/debian/patches/series b/packaging/debian/patches/series
index 76a943c..ff932ea 100644 (file)
--- a/packaging/debian/patches/series
+++ b/packaging/debian/patches/series
@@ -1,4 +1,3 @@
-globe-projection-rangecheck.diff
 maemo-startup-files.diff
 install-lang-files.diff
 newstuff-mapthemes.diff