Make xf86vidmode support optional

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

diff --git a/source/gbase/image.cpp b/source/gbase/image.cpp
index c4b3a5a18eed0684d1bb14ad864bc459b5d88839..81c1abef340e05c95ab3243789eb3bf8b9b369a0 100644 (file)
--- a/source/gbase/image.cpp
+++ b/source/gbase/image.cpp
@@ -175,6 +175,7 @@ void Image::load_file(const string &fn)
                throw Exception("Not a PNG image and DevIL support not compiled in");
 #endif
        }
+       (void)fn;
 }
 
 void Image::load_memory(const void *data, unsigned size)
@@ -195,9 +196,10 @@ void Image::load_memory(const void *data, unsigned size)
                        throw Exception("Error loading image from memory");
 #else
                throw Exception("Not a PNG image and DevIL support not compiled in");
-               //(void)data; (void)size;
 #endif
        }
+       (void)data;
+       (void)size;
 }
 
 PixelFormat Image::get_format() const
@@ -246,7 +248,7 @@ unsigned Image::get_height() const
 {
 #ifdef WITH_LIBPNG
        if(priv->data)
-               return priv->width;
+               return priv->height;
 #endif
 #ifdef WITH_DEVIL
        if(priv->id)