Some tidying up

[opengl.git] / image.cpp

diff --git a/image.cpp b/image.cpp
index 1565b859142df1d3897932c4790026ab77a71825..fb534be70302ef92ca80ab2ba3a8255a10d6326c 100644 (file)
--- a/image.cpp
+++ b/image.cpp
@@ -6,15 +6,31 @@ 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);
        colorSpace = CGImageGetColorSpace(ref);
+       bitsPerComponent = CGImageGetBitsPerComponent(ref);
 
        dataRef = CGDataProviderCopyData(CGImageGetDataProvider(ref));
-       CGImageRelease(ref);
-
 }
 
 unsigned char *Image::data() const {
@@ -25,7 +41,7 @@ GLfloat Image::width() const { return _width; }
 GLfloat Image::height() const { return _height; }
 
 // TODO: Properly implement this for both internal format + format
-GLuint Image::format() const {
+GLenum Image::format() const {
        if (CGColorSpaceGetModel(colorSpace) == kCGColorSpaceModelMonochrome) {
                return GL_DEPTH_COMPONENT;
        }
@@ -35,4 +51,34 @@ GLuint Image::format() const {
        return GL_RGBA;
 }
 
+inline bool Image::usesFloat() const { return info & kCGBitmapFloatComponents; }
+
+GLint Image::internalFormat() const {
+       switch (format()) {
+               case GL_DEPTH_COMPONENT: return GL_DEPTH_COMPONENT;
+        case GL_RGB:
+            if (bitsPerComponent == 16)
+                               return usesFloat() ? GL_RGB16F : GL_RGB16;
+            else if (bitsPerComponent == 8)
+                               return GL_RGB;
+            else abort();
+               default: return GL_RGBA;
+       }
+}
+
+GLenum Image::type() const {
+       if (usesFloat()) {
+               if (bitsPerComponent == 16) return GL_HALF_FLOAT;
+               else if (bitsPerComponent == 32) return GL_FLOAT;
+               abort();
+       }
+       return GL_UNSIGNED_BYTE;
+       
+       //TODO:
+       /* switch (bitsPerComponent) { */
+       /*      case 1: return GL_UNSIGNED_BYTE; */
+       /*      case 16: return GL_UNSIGNED_SHORT; */
+       /*  case 24: */ 
+}
+
 Image::~Image() { CFRelease(dataRef); }