Move Image to mspgbase

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

diff --git a/source/texture3d.cpp b/source/texture3d.cpp
index fdf61cde4366600f2f37438a5824f25299b07f87..2fc4f997396e3dcf7f3f1a9417532c8cd3364f9c 100644 (file)
--- a/source/texture3d.cpp
+++ b/source/texture3d.cpp
@@ -6,9 +6,9 @@ Distributed under the LGPL
 */
 
 #include <cmath>
+#include <msp/gbase/image.h>
 #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();
@@ -68,8 +68,8 @@ void Texture3D::load_image(const string &fn, int dp)
        }
        else if(dp==-2)
        {
-               for(d=h; d*d>h; d>>=2);
-               for(; d*d<h; ++d);
+               for(d=h; d*d>h; d>>=2) ;
+               for(; d*d<h; ++d) ;
                if(d*d!=h)
                        throw IncompatibleData("Could not find a square root of texture height");
                h=d;
@@ -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)