From 33cc51c1d2e00bc4e161e5f7ba7710ba899e4dd8 Mon Sep 17 00:00:00 2001 From: artemp Date: Mon, 17 Nov 2014 12:21:58 +0100 Subject: [PATCH] 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) --- platform/default/jpeg_reader.cpp | 10 ++-------- platform/default/png_reader.cpp | 10 ++-------- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/platform/default/jpeg_reader.cpp b/platform/default/jpeg_reader.cpp index d56c10af2..f1e9d0fdf 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(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(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 76437dec3..838344286 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(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(data, size); } const static bool registered = register_image_reader("png",create_png_reader); -const static bool registered2 = register_image_reader("png", create_png_reader2); + }