X-Git-Url: https://git.lukelau.me/?p=opengl.git;a=blobdiff_plain;f=image.hpp;h=5a75b0daa6add203c96c2f155ca44638c1ba0600;hp=b6d79201bffddcca414605ef7d11ef1ff6104146;hb=d0c631f46c6db417e013b1bc0edec24cb9c2824a;hpb=c44e69ec78367fb2957324026894aef970f2481a

diff --git a/image.hpp b/image.hpp
index b6d7920..5a75b0d 100644
--- a/image.hpp
+++ b/image.hpp
@@ -1,3 +1,6 @@
+#ifndef IMAGE_HPP
+#define IMAGE_HPP
+
 #include <iostream>
 #include <fstream>
 #ifdef __APPLE__
@@ -8,13 +11,24 @@
 class Image {
 	public:
 		Image(const std::string &path);
+		Image(const unsigned char *data, size_t length, const char *formatHint);
 		~Image();
-		unsigned char *data();
+		unsigned char *data() const;
 		GLfloat width() const;
 	   	GLfloat height() const;
+		GLenum format() const;
+		GLint internalFormat() const;
+		GLenum type() const;
 	private:
 		#ifdef __APPLE__
+		void initWithImageRef(CGImageRef ref);
 		CFDataRef dataRef;
+		CGBitmapInfo info;
+		CGImageAlphaInfo alphaInfo;
+		CGColorSpaceRef colorSpace;
 		GLfloat _width, _height;
+		size_t bitsPerComponent;
 		#endif
 };
+
+#endif