PBR checkpoint

[opengl.git] / image.hpp

diff --git a/image.hpp b/image.hpp
index b6d79201bffddcca414605ef7d11ef1ff6104146..41b45ba3ac01ade461d54741c7e997560fcedcb6 100644 (file)
--- a/image.hpp
+++ b/image.hpp
@@ -1,3 +1,6 @@
+#ifndef IMAGE_HPP
+#define IMAGE_HPP
+
 #include <iostream>
 #include <fstream>
 #ifdef __APPLE__
@@ -9,12 +12,18 @@ class Image {
        public:
                Image(const std::string &path);
                ~Image();
-               unsigned char *data();
+               unsigned char *data() const;
                GLfloat width() const;
                GLfloat height() const;
+               GLuint format() const;
        private:
                #ifdef __APPLE__
                CFDataRef dataRef;
+               CGBitmapInfo info;
+               CGImageAlphaInfo alphaInfo;
+               CGColorSpaceRef colorSpace;
                GLfloat _width, _height;
                #endif
 };
+
+#endif