Refactor texture external image loading into a helper function

diff --git a/source/texture.cpp b/source/texture.cpp
index b747a2a6b0d7001b3d06e7a2811f91e93f075e78..703ea96c5fabfddb2cb8b33c65cb8056df205f16 100644 (file)
--- a/source/texture.cpp
+++ b/source/texture.cpp
@@ -306,14 +306,18 @@ unsigned Texture::Loader::get_levels() const
 
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-void Texture::Loader::external_image(const string &fn)
+void Texture::Loader::load_external_image(Graphics::Image &img, const std::string &fn)
 {
-       Graphics::Image img;
        RefPtr<IO::Seekable> io = get_collection().open_raw(fn);
        if(!io)
                throw IO::file_not_found(fn);
        img.load_io(*io);
+}
 
+void Texture::Loader::external_image(const string &fn)
+{
+       Graphics::Image img;
+       load_external_image(img, fn);
        obj.image(img, get_levels(), srgb);
 }
 

diff --git a/source/texture.h b/source/texture.h
index 30c6496a5658525e00a6ac59374996c25f08d7e3..6ee0b8a107754e83c7bf2d49b4fe6f68f2e11db4 100644 (file)
--- a/source/texture.h
+++ b/source/texture.h
@@ -39,7 +39,10 @@ protected:
                void init();
 
                unsigned get_levels() const;
+       protected:
+               void load_external_image(Graphics::Image &, const std::string &);
 
+       private:
                void external_image(const std::string &);
                void filter(TextureFilter);
                void generate_mipmap(bool);

diff --git a/source/texture2darray.cpp b/source/texture2darray.cpp
index c080481b106590f5a6a159be78ad1618142cf85f..4d37263c76b75c59ddb06f5e03d6e0096cd43439 100644 (file)
--- a/source/texture2darray.cpp
+++ b/source/texture2darray.cpp
@@ -72,11 +72,7 @@ void Texture2DArray::Loader::init()
 void Texture2DArray::Loader::external_image(unsigned z, const string &fn)
 {
        Graphics::Image img;
-       RefPtr<IO::Seekable> io = get_collection().open_raw(fn);
-       if(!io)
-               throw IO::file_not_found(fn);
-       img.load_io(*io);
-
+       load_external_image(img, fn);
        obj.layer_image(0, z, img);
 }