simplify factory class to not rely on singleton + cleanups

1 files changed, 1 insertions, 16 deletions

diff --git a/platform/default/image_reader.cpp b/platform/default/image_reader.cpp
index 75d7b0c139..53ab5758aa 100644
--- a/platform/default/image_reader.cpp
+++ b/platform/default/image_reader.cpp
@@ -43,25 +43,10 @@ image_reader* get_image_reader(char const* data, size_t size)
     boost::optional<std::string> type = type_from_bytes(data,size);
     if (type)
     {
-        return factory<image_reader,std::string,char const*,size_t>::instance().create_object(*type, data,size);
+        return factory<image_reader,std::string,char const*,size_t>::create_object(*type, data,size);
     }
     else
         throw image_reader_exception("image_reader: can't determine type from input data");
 }
 
-//image_reader* get_image_reader(std::string const& filename,std::string const& type)
-//{
-//    return factory<image_reader,std::string,std::string const&>::instance().create_object(type,filename);
-//}
-
-//image_reader* get_image_reader(std::string const& filename)
-//{
-    //boost::optional<std::string> type = type_from_filename(filename);
-    //if (type)
-    //{
-    //    return factory<image_reader,std::string,std::string const&>::instance().create_object(*type,filename);
-    //}
-//    return 0;
-//}
-
 }}