X-Git-Url: https://git.lukelau.me/?p=opengl.git;a=blobdiff_plain;f=image.cpp;h=02fd60b878ee1122bd9a027e38df10304d681ef8;hp=e3c5cbdb81fe2355c63c9452b25f8a92adec68f9;hb=d0c631f46c6db417e013b1bc0edec24cb9c2824a;hpb=0291188124d08368ce28b308482604218bd75393

diff --git a/image.cpp b/image.cpp
index e3c5cbd..02fd60b 100644
--- a/image.cpp
+++ b/image.cpp
@@ -6,7 +6,24 @@ Image::Image(const std::string &path) {
 	CFURLRef url = CFURLCreateWithFileSystemPath(NULL, str, kCFURLPOSIXPathStyle, false);
 	CGImageSourceRef source = CGImageSourceCreateWithURL(url, NULL);
 	CGImageRef ref = CGImageSourceCreateImageAtIndex(source, 0, NULL);
+	initWithImageRef(ref);
+	CGImageRelease(ref);
+}
 
+Image::Image(const unsigned char *data, size_t length, const char *formatHint) {
+	CGDataProviderRef dpRef = CGDataProviderCreateWithData(NULL, data, length, NULL);
+	CGImageRef ref;
+	if (strcmp("png", formatHint) == 0)
+		ref = CGImageCreateWithPNGDataProvider(dpRef, NULL, false, kCGRenderingIntentDefault);
+	else if (strcmp("jpg", formatHint) == 0)
+		ref = CGImageCreateWithJPEGDataProvider(dpRef, NULL, false, kCGRenderingIntentDefault);
+	else
+		abort();
+	initWithImageRef(ref);
+	CGImageRelease(ref);
+}
+
+void Image::initWithImageRef(CGImageRef ref) {
 	_width = CGImageGetWidth(ref), _height = CGImageGetHeight(ref);
 	info = CGImageGetBitmapInfo(ref);
 	alphaInfo = CGImageGetAlphaInfo(ref);
@@ -14,8 +31,6 @@ Image::Image(const std::string &path) {
 	bitsPerComponent = CGImageGetBitsPerComponent(ref);
 
 	dataRef = CGDataProviderCopyData(CGImageGetDataProvider(ref));
-	CGImageRelease(ref);
-
 }
 
 unsigned char *Image::data() const {