This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository jmapviewer.
commit 259e63c9d3e5214a5fc1a1695a91ec2573750913 Author: Bas Couwenberg <[email protected]> Date: Sat Jan 7 23:06:02 2017 +0100 Add patches from upstream SVN repository. --- debian/changelog | 1 + debian/patches/series | 4 ++++ ...32821_Use-visitor-pattern-for-painting-tiles.patch | 15 +++++++++++++++ ...spracency-for-placeholders-loaded-from-cache.patch | 16 ++++++++++++++++ .../svn-r33079_Fix-NarrowingCompoundAssignment.patch | 19 +++++++++++++++++++ ...-r33081_Use-TimeUnit-instead-of-combinations.patch | 16 ++++++++++++++++ 6 files changed, 71 insertions(+) diff --git a/debian/changelog b/debian/changelog index 89d725c..495d7b2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ jmapviewer (2.0+dfsg-2) UNRELEASED; urgency=medium * Include epoch in default-jdk version requirement. + * Add patches from upstream SVN repository. -- Bas Couwenberg <[email protected]> Thu, 01 Sep 2016 12:55:24 +0200 diff --git a/debian/patches/series b/debian/patches/series index 32e8c24..4cb61d5 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,6 @@ 01-build_less.patch 03-use-installed-library-in-demo.patch +svn-r32821_Use-visitor-pattern-for-painting-tiles.patch +svn-r33034_Use-images-supporting-transpracency-for-placeholders-loaded-from-cache.patch +svn-r33079_Fix-NarrowingCompoundAssignment.patch +svn-r33081_Use-TimeUnit-instead-of-combinations.patch diff --git a/debian/patches/svn-r32821_Use-visitor-pattern-for-painting-tiles.patch b/debian/patches/svn-r32821_Use-visitor-pattern-for-painting-tiles.patch new file mode 100644 index 0000000..b95727d --- /dev/null +++ b/debian/patches/svn-r32821_Use-visitor-pattern-for-painting-tiles.patch @@ -0,0 +1,15 @@ +Description: fix #13222 - Use visitor pattern for painting tiles (patch by michael2402) - gsoc-core +Author: michael2402 +Origin: https://trac.openstreetmap.org/changeset/32821/subversion + +--- a/src/org/openstreetmap/gui/jmapviewer/Tile.java ++++ b/src/org/openstreetmap/gui/jmapviewer/Tile.java +@@ -228,7 +228,7 @@ public class Tile { + } + + /** +- * @return tile indexes as TileXY object ++ * @return tile indexes of the top left corner as TileXY object + */ + public TileXY getTileXY() { + return new TileXY(xtile, ytile); diff --git a/debian/patches/svn-r33034_Use-images-supporting-transpracency-for-placeholders-loaded-from-cache.patch b/debian/patches/svn-r33034_Use-images-supporting-transpracency-for-placeholders-loaded-from-cache.patch new file mode 100644 index 0000000..c3ebd20 --- /dev/null +++ b/debian/patches/svn-r33034_Use-images-supporting-transpracency-for-placeholders-loaded-from-cache.patch @@ -0,0 +1,16 @@ +Description: Use images supporting transpracency for placeholders loaded from cache. +Author: wiktorn +Bug: http://josm.openstreetmap.de/intertrac/ticket%3A13778 +Origin: https://trac.openstreetmap.org/changeset/33034/subversion + +--- a/src/org/openstreetmap/gui/jmapviewer/Tile.java ++++ b/src/org/openstreetmap/gui/jmapviewer/Tile.java +@@ -126,7 +126,7 @@ public class Tile { + final CachedCallable<BufferedImage> tmpImage = new CachedCallable<>(new Callable<BufferedImage>() { + @Override + public BufferedImage call() throws Exception { +- return new BufferedImage(source.getTileSize(), source.getTileSize(), BufferedImage.TYPE_INT_RGB); ++ return new BufferedImage(source.getTileSize(), source.getTileSize(), BufferedImage.TYPE_INT_ARGB); + } + }); + diff --git a/debian/patches/svn-r33079_Fix-NarrowingCompoundAssignment.patch b/debian/patches/svn-r33079_Fix-NarrowingCompoundAssignment.patch new file mode 100644 index 0000000..a5a6955 --- /dev/null +++ b/debian/patches/svn-r33079_Fix-NarrowingCompoundAssignment.patch @@ -0,0 +1,19 @@ +Description: Fix http://errorprone.info/bugpattern/NarrowingCompoundAssignment +Author: simon04 +Origin: https://trac.openstreetmap.org/changeset/33079/subversion + +--- a/src/org/openstreetmap/gui/jmapviewer/tilesources/BingAerialTileSource.java ++++ b/src/org/openstreetmap/gui/jmapviewer/tilesources/BingAerialTileSource.java +@@ -303,10 +303,10 @@ public class BingAerialTileSource extend + char digit = 48; + int mask = 1 << (i - 1); + if ((tilex & mask) != 0) { +- digit += 1; ++ digit += (char) 1; + } + if ((tiley & mask) != 0) { +- digit += 2; ++ digit += (char) 2; + } + k.append(digit); + } diff --git a/debian/patches/svn-r33081_Use-TimeUnit-instead-of-combinations.patch b/debian/patches/svn-r33081_Use-TimeUnit-instead-of-combinations.patch new file mode 100644 index 0000000..00db724 --- /dev/null +++ b/debian/patches/svn-r33081_Use-TimeUnit-instead-of-combinations.patch @@ -0,0 +1,16 @@ +Description: Use TimeUnit instead of combinations of 1000/60/60/24 +Author: simon04 +Bug: http://josm.openstreetmap.de/intertrac/ticket%3A13376 +Origin: https://trac.openstreetmap.org/changeset/33081/subversion + +--- a/src/org/openstreetmap/gui/jmapviewer/tilesources/BingAerialTileSource.java ++++ b/src/org/openstreetmap/gui/jmapviewer/tilesources/BingAerialTileSource.java +@@ -243,7 +243,7 @@ public class BingAerialTileSource extend + return r; + } catch (IOException ex) { + System.err.println("Could not connect to Bing API. Will retry in " + waitTimeSec + " seconds."); +- Thread.sleep(waitTimeSec * 1000L); ++ Thread.sleep(TimeUnit.SECONDS.toMillis(waitTimeSec)); + waitTimeSec *= 2; + } + } -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/jmapviewer.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
