Put (most of) DevIL code in its own file

[libs/gui.git] / source / graphics / image.cpp

diff --git a/source/graphics/image.cpp b/source/graphics/image.cpp
index 56e7c1b01f59c54338e5cfb671f9961ba9502c8b..6a20178c5d4a5d115ed1748100374d13a3e03f38 100644 (file)
--- a/source/graphics/image.cpp
+++ b/source/graphics/image.cpp
@@ -4,6 +4,7 @@
 #include <msp/io/file.h>
 #include <msp/io/memory.h>
 #include "image.h"
+#include "image_devil.h"
 #include "image_png.h"
 #include "image_private.h"
 
@@ -17,35 +18,10 @@ Image::Private::Private()
 #ifdef WITH_DEVIL
        id = 0;
 #endif
-#ifdef WITH_LIBPNG
        fmt = RGB;
        width = 0;
        height = 0;
        data = 0;
-#endif
-}
-
-
-namespace {
-
-#ifdef WITH_DEVIL
-void ensure_devil_image(unsigned &id)
-{
-       static bool init_done = false;
-
-       if(!init_done)
-       {
-               ilInit();
-               ilEnable(IL_ORIGIN_SET);
-               ilOriginFunc(IL_ORIGIN_LOWER_LEFT);
-               init_done = true;
-       }
-
-       if(!id)
-               ilGenImages(1, &id);
-}
-#endif
-
 }
 
 
@@ -62,10 +38,9 @@ Image::~Image()
 #ifdef WITH_DEVIL
        if(priv->id)
                ilDeleteImages(1, &priv->id);
+       else
 #endif
-#ifdef WITH_LIBPNG
        delete[] priv->data;
-#endif
        delete priv;
 }
 
@@ -81,10 +56,7 @@ void Image::load_file(const string &fn)
 #endif
        {
 #ifdef WITH_DEVIL
-               ensure_devil_image(priv->id);
-               ilBindImage(priv->id);
-               if(!ilLoadImage(const_cast<char *>(fn.c_str())))
-                       throw bad_image_data("IL error");
+               load_devil_file(fn, *priv);
 #else
                throw unsupported_image_format("DevIL needed for non-PNG images");
 #endif
@@ -104,10 +76,7 @@ void Image::load_memory(const void *data, unsigned size)
 #endif
        {
 #ifdef WITH_DEVIL
-               ensure_devil_image(priv->id);
-               ilBindImage(priv->id);
-               if(!ilLoadL(IL_TYPE_UNKNOWN, const_cast<void *>(data), size))
-                       throw bad_image_data("IL error");
+               load_devil_mem(data, size, *priv);
 #else
                throw unsupported_image_format("DevIL needed for non-PNG images");
 #endif
@@ -118,77 +87,22 @@ void Image::load_memory(const void *data, unsigned size)
 
 PixelFormat Image::get_format() const
 {
-#ifdef WITH_LIBPNG
-       if(priv->data)
-               return priv->fmt;
-#endif
-#ifdef WITH_DEVIL
-       if(priv->id)
-       {
-               ilBindImage(priv->id);
-               switch(ilGetInteger(IL_IMAGE_FORMAT))
-               {
-               case IL_COLOR_INDEX: return COLOR_INDEX;
-               case IL_LUMINANCE: return LUMINANCE;
-               case IL_LUMINANCE_ALPHA: return LUMINANCE_ALPHA;
-               case IL_RGB: return RGB;
-               case IL_RGBA: return RGBA;
-               case IL_BGR: return BGR;
-               case IL_BGRA: return BGRA;
-               // XXX bad, should throw when loading
-               default: throw invalid_argument("unknown pixel format in image");
-               }
-       }
-#endif
-       return RGB;
+       return priv->fmt;
 }
 
 unsigned Image::get_width() const
 {
-#ifdef WITH_LIBPNG
-       if(priv->data)
-               return priv->width;
-#endif
-#ifdef WITH_DEVIL
-       if(priv->id)
-       {
-               ilBindImage(priv->id);
-               return ilGetInteger(IL_IMAGE_WIDTH);
-       }
-#endif
-       return 0;
+       return priv->width;
 }
 
 unsigned Image::get_height() const
 {
-#ifdef WITH_LIBPNG
-       if(priv->data)
-               return priv->height;
-#endif
-#ifdef WITH_DEVIL
-       if(priv->id)
-       {
-               ilBindImage(priv->id);
-               return ilGetInteger(IL_IMAGE_HEIGHT);
-       }
-#endif
-       return 0;
+       return priv->height;
 }
 
 const void *Image::get_data() const
 {
-#ifdef WITH_LIBPNG
-       if(priv->data)
-               return priv->data;
-#endif
-#ifdef WITH_DEVIL
-       if(priv->id)
-       {
-               ilBindImage(priv->id);
-               return ilGetData();
-       }
-#endif
-       return 0;
+       return priv->data;
 }
 
 } // namespace Graphics