Add pixel formats with a padding component

[libs/gui.git] / source / graphics / quartz / quartzloader.cpp

diff --git a/source/graphics/quartz/quartzloader.cpp b/source/graphics/quartz/quartzloader.cpp
index a7c610d4ab62094fa88c8969ea8bdb5fe6e76cdf..aa11daaedff1fe6def85092da71a16501f55b272 100644 (file)
--- a/source/graphics/quartz/quartzloader.cpp
+++ b/source/graphics/quartz/quartzloader.cpp
@@ -102,7 +102,9 @@ void QuartzLoader::load(Image::Data &data)
                {
                        if(alpha==kCGImageAlphaLast)
                                data.fmt = RGBA;
-                       else if(alpha==kCGImageAlphaNone || alpha==kCGImageAlphaNoneSkipFirst || alpha==kCGImageAlphaNoneSkipLast)
+                       else if(alpha==kCGImageAlphaNoneSkipLast)
+                               data.fmt = RGBX;
+                       else if(alpha==kCGImageAlphaNone || alpha==kCGImageAlphaNoneSkipFirst)
                                data.fmt = RGB;
                        else
                                throw unsupported_image_format("unknown alpha mode");
@@ -118,7 +120,7 @@ void QuartzLoader::load(Image::Data &data)
 
                CFRelease(image);
 
-               if(alpha==kCGImageAlphaNoneSkipFirst || alpha==kCGImageAlphaNoneSkipLast)
+               if(alpha==kCGImageAlphaNoneSkipFirst)
                {
                        const char *src = data.data;
                        if(alpha==kCGImageAlphaNoneSkipFirst)