Remove the deprecated ProgramBuilder class

[libs/gl.git] / source / texture2darray.cpp

diff --git a/source/texture2darray.cpp b/source/texture2darray.cpp
index c080481b106590f5a6a159be78ad1618142cf85f..1ecb4cf2be69e1b34a28f1f8b8cea643b84e2325 100644 (file)
--- a/source/texture2darray.cpp
+++ b/source/texture2darray.cpp
@@ -48,7 +48,7 @@ void Texture2DArray::layer_image(unsigned level, unsigned z, const Graphics::Ima
        PixelStore pstore = PixelStore::from_image(img);
        BindRestore _bind_ps(pstore);
 
-       layer_image(level, z, img.get_data());
+       layer_image(level, z, img.get_pixels());
 }
 
 
@@ -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);
 }