diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-02-01 12:19:37 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-03-15 16:52:24 +0000 |
| commit | 6b35497375c07c49cca7317a4452acc6adc7a1cd (patch) | |
| tree | 5531da6c89bb3da6495e8c83a0b86bff638f3baa /src/core/type_conversion.cpp | |
| parent | 91e13af7e1056a7bad83eb34ebf63fdd45e24bea (diff) | |
Basic adaptations for 65-based
Change-Id: I121b14d6a44e80f5eea4b159c58f7010d472926e
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'src/core/type_conversion.cpp')
| -rw-r--r-- | src/core/type_conversion.cpp | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/src/core/type_conversion.cpp b/src/core/type_conversion.cpp index 685ee273e..2a9746660 100644 --- a/src/core/type_conversion.cpp +++ b/src/core/type_conversion.cpp @@ -74,6 +74,7 @@ QImage toQImage(const SkBitmap &bitmap) break; } break; + case kRGB_888x_SkColorType: case kRGBA_8888_SkColorType: switch (bitmap.alphaType()) { case kUnknown_SkAlphaType: @@ -105,6 +106,21 @@ QImage toQImage(const SkBitmap &bitmap) break; } break; + case kRGB_101010x_SkColorType: + case kRGBA_1010102_SkColorType: + switch (bitmap.alphaType()) { + case kUnknown_SkAlphaType: + break; + case kUnpremul_SkAlphaType: + // not supported - treat as opaque + case kOpaque_SkAlphaType: + image = toQImage(bitmap, QImage::Format_RGB30); + break; + case kPremul_SkAlphaType: + image = toQImage(bitmap, QImage::Format_A2RGB30_Premultiplied); + break; + } + break; case kGray_8_SkColorType: image = toQImage(bitmap, QImage::Format_Grayscale8); break; |