[mapnik] 09/14: All patches are useless

[Jérémy Lal]

This is an automated email from the git hooks/post-receive script.

kapouer pushed a commit to branch master
in repository mapnik.

commit 5ea9f133bf81ca81225701b9804dbafa2854cf99
Author: Jérémy Lal <kapouer at melix.org>
Date:   Tue May 26 22:18:42 2015 +0200

    All patches are useless
    
    Signed-off-by: Jérémy Lal <kapouer at melix.org>
---
 debian/patches/fix_mapnik_raster.patch | 15 ---------------
 debian/patches/remove_exit_calls.patch | 34 ----------------------------------
 debian/patches/series                  |  2 --
 3 files changed, 51 deletions(-)

diff --git a/debian/patches/fix_mapnik_raster.patch b/debian/patches/fix_mapnik_raster.patch
deleted file mode 100644
index bafb8d2..0000000
--- a/debian/patches/fix_mapnik_raster.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: fix mapnik::raster call
-Forwarded: https://github.com/mapnik/mapnik/pull/2548
-Last-Update: 2014-10-24
-Author: Jérémy Lal <kapouer at melix.org>
---- a/plugins/input/rasterlite/rasterlite_featureset.cpp
-+++ b/plugins/input/rasterlite/rasterlite_featureset.cpp
-@@ -114,7 +114,7 @@
-         {
-             if (size > 0)
-             {
--                mapnik::raster_ptr rasterp = std::make_shared<mapnik::raster>(intersect, width, height);
-+                mapnik::raster_ptr rasterp = std::make_shared<mapnik::raster>(intersect, width, height, 1.0);
-                 mapnik::image_data_32 & image = rasterp->data_;
-                 image.set(0xffffffff);
- 
diff --git a/debian/patches/remove_exit_calls.patch b/debian/patches/remove_exit_calls.patch
deleted file mode 100644
index 276141e..0000000
--- a/debian/patches/remove_exit_calls.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Description: remove exit calls in shared lib
-Forwarded: https://github.com/mapnik/mapnik/issues/2547
-Last-Update: 2014-10-24
-Author: Jérémy Lal <kapouer at melix.org>
---- a/plugins/input/osm/render.cpp
-+++ b/plugins/input/osm/render.cpp
-@@ -40,7 +40,7 @@
-     if (argc < 6)
-     {
-         std::cerr << "Usage: render XMLfile w s e n [OSMfile]" << std::endl;
--        exit(0);
-+        return 0;
-     }
- 
-     mapnik::datasource_cache::instance().register_datasources("/usr/local/lib/mapnik/input");
---- a/deps/mapnik/sparsehash/internal/densehashtable.h
-+++ b/deps/mapnik/sparsehash/internal/densehashtable.h
-@@ -1175,7 +1175,6 @@
-     pointer realloc_or_die(pointer /*ptr*/, size_type /*n*/) {
-       fprintf(stderr, "realloc_or_die is only supported for "
-                       "libc_allocator_with_realloc\n");
--      exit(1);
-       return NULL;
-     }
-   };
-@@ -1197,7 +1196,7 @@
-       if (retval == NULL) {
-         fprintf(stderr, "sparsehash: FATAL ERROR: failed to reallocate "
-                 "%lu elements for ptr %p", static_cast<unsigned long>(n), ptr);
--        exit(1);
-+        return NULL; 
-       }
-       return retval;
-     }
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index e5d8f75..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-remove_exit_calls.patch
-fix_mapnik_raster.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mapnik.git