cade lab fixes

[chaz/yoink] / src / Moof / Image.cc

diff --git a/src/Moof/Image.cc b/src/Moof/Image.cc
index 31d6b0287926e38e35f7fc51c58be55571cfdba5..51e7ad836962139c55d29543f15dc60a22cac559 100644 (file)
--- a/src/Moof/Image.cc
+++ b/src/Moof/Image.cc
@@ -32,6 +32,8 @@
 #include <SDL/SDL.h>
 #include <png.h>
 
+#include "Core.hh"
+#include "Error.hh"
 #include "Image.hh"
 #include "Library.hh"
 #include "Log.hh"
@@ -98,6 +100,8 @@ public:
 
 private:
 
+       Backend                 mBackend;
+
        bool init(const std::string& filePath, bool flipped)
        {
                logInfo("opening image file...");
@@ -156,7 +160,7 @@ private:
                                break;
 
                        case PNG_COLOR_TYPE_GRAY:
-                               if (bpp < 8) png_set_gray_1_2_4_to_8(pngObj);
+                               if (bpp < 8) png_set_expand(pngObj);
                                break;
 
                        case PNG_COLOR_TYPE_GRAY_ALPHA: