X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Ftexture3d.cpp;h=2fc4f997396e3dcf7f3f1a9417532c8cd3364f9c;hp=a2d371e7856c108b6c7eac2de3284119bc735e1a;hb=a5797c9babd17673285b3b15c7572c2d8fe1595c;hpb=d23880571efc16dff1cfeeb92f35fe54c8f64c3d diff --git a/source/texture3d.cpp b/source/texture3d.cpp index a2d371e7..2fc4f997 100644 --- a/source/texture3d.cpp +++ b/source/texture3d.cpp @@ -6,9 +6,9 @@ Distributed under the LGPL */ #include +#include #include "except.h" #include "extension.h" -#include "ilwrap.h" #include "texture3d.h" #include "version_1_2.h" @@ -52,7 +52,7 @@ void Texture3D::image(int level, PixelFormat fmt, DataType type, const void *dat void Texture3D::load_image(const string &fn, int dp) { - Image img; + Graphics::Image img; img.load_file(fn); unsigned w=img.get_width(); @@ -77,7 +77,7 @@ void Texture3D::load_image(const string &fn, int dp) else if(dp>0) d=dp; - PixelFormat fmt=img.get_format(); + PixelFormat fmt=pixelformat_from_graphics(img.get_format()); if(width==0) storage(fmt, w, h, d, 0); else if(w!=width || h!=height || d!=depth)