2.0. Updated namespaces.

[casparcg] / modules / image / util / image_loader.cpp

diff --git a/modules/image/util/image_loader.cpp b/modules/image/util/image_loader.cpp
index e1b29ca9894dd3cf46611313a69c2fa575eb8442..ae4d461bfad5da698e23d379bc9d74b47251ce3b 100644 (file)
--- a/modules/image/util/image_loader.cpp
+++ b/modules/image/util/image_loader.cpp
@@ -28,18 +28,11 @@
 \r
 #include <boost/exception/errinfo_file_name.hpp>\r
 #include <boost/filesystem.hpp>\r
-#include <boost/thread/once.hpp>\r
 \r
-namespace caspar { \r
+namespace caspar { namespace image {\r
 \r
 std::shared_ptr<FIBITMAP> load_image(const std::string& filename)\r
 {\r
-       struct FreeImage_initializer\r
-       {\r
-               FreeImage_initializer(){FreeImage_Initialise(true);}\r
-               ~FreeImage_initializer(){FreeImage_DeInitialise();}\r
-       } static init;\r
-\r
        if(!boost::filesystem::exists(filename))\r
                BOOST_THROW_EXCEPTION(file_not_found() << boost::errinfo_file_name(filename));\r
 \r
@@ -68,4 +61,4 @@ std::shared_ptr<FIBITMAP> load_image(const std::wstring& filename)
        return load_image(narrow(filename));\r
 }\r
 \r
-}
\ No newline at end of file
+}}
\ No newline at end of file