summaryrefslogtreecommitdiff
path: root/platform
diff options
context:
space:
mode:
authorartemp <artem@mapnik.org>2014-11-17 12:21:58 +0100
committerartemp <artem@mapnik.org>2014-11-17 12:21:58 +0100
commit08357cfcf86ad0b6c8e8563767110ed50cbb2f56 (patch)
tree8bae701a1b7e9ea9f4cb97ad5f6123cfe0aef5a6 /platform
parent9051ae17cf65339546b6328896f3d2854b16c861 (diff)
downloadqtlocation-mapboxgl-08357cfcf86ad0b6c8e8563767110ed50cbb2f56.tar.gz
image-readers: only register readers that are used
create_png_reader(char const* data, size_t size) create_jpeg_reader(char const* data, size_t size)
Diffstat (limited to 'platform')
-rw-r--r--platform/default/jpeg_reader.cpp10
-rw-r--r--platform/default/png_reader.cpp10
2 files changed, 4 insertions, 16 deletions
diff --git a/platform/default/jpeg_reader.cpp b/platform/default/jpeg_reader.cpp
index d56c10af2a..f1e9d0fdfe 100644
--- a/platform/default/jpeg_reader.cpp
+++ b/platform/default/jpeg_reader.cpp
@@ -71,18 +71,12 @@ private:
namespace
{
-image_reader* create_jpeg_reader(std::string const& file)
-{
- return new jpeg_reader<boost::iostreams::file_source>(file);
-}
-
-image_reader* create_jpeg_reader2(char const* data, size_t size)
+image_reader* create_jpeg_reader(char const* data, size_t size)
{
return new jpeg_reader<boost::iostreams::array_source>(data, size);
}
-const static bool registered = register_image_reader("jpeg",create_jpeg_reader);
-const static bool registered2 = register_image_reader("jpeg",create_jpeg_reader2);
+const static bool registered = register_image_reader("jpeg",create_jpeg_reader);
}
// ctors
diff --git a/platform/default/png_reader.cpp b/platform/default/png_reader.cpp
index 76437dec38..838344286e 100644
--- a/platform/default/png_reader.cpp
+++ b/platform/default/png_reader.cpp
@@ -61,19 +61,13 @@ private:
namespace
{
-
-image_reader* create_png_reader(std::string const& file)
-{
- return new png_reader<boost::iostreams::file_source>(file);
-}
-
-image_reader* create_png_reader2(char const * data, std::size_t size)
+image_reader* create_png_reader(char const * data, std::size_t size)
{
return new png_reader<boost::iostreams::array_source>(data, size);
}
const static bool registered = register_image_reader("png",create_png_reader);
-const static bool registered2 = register_image_reader("png", create_png_reader2);
+
}