diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-01-22 10:55:57 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-01-25 15:41:53 +0100 |
| commit | cde72003881c6b5680ac8ac0fe6d6971bb43e0d5 (patch) | |
| tree | fcb50002765c1cb179dd6f62054380c3fed85e80 /src/core/type_conversion.cpp | |
| parent | 3fb215dab139fd7b61473ce3fe1058b87a6b4fe3 (diff) | |
| parent | 75d061bbc68875c08b3dc243e464e32a80da71df (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Including update to 87-based
Change-Id: I36b6054e00de97ab055d0bc800cff08d0408fac6
Diffstat (limited to 'src/core/type_conversion.cpp')
| -rw-r--r-- | src/core/type_conversion.cpp | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/src/core/type_conversion.cpp b/src/core/type_conversion.cpp index bf2656de4..a4cc57b76 100644 --- a/src/core/type_conversion.cpp +++ b/src/core/type_conversion.cpp @@ -133,6 +133,21 @@ QImage toQImage(const SkBitmap &bitmap) break; } break; + case kBGR_101010x_SkColorType: + case kBGRA_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_BGR30); + break; + case kPremul_SkAlphaType: + image = toQImage(bitmap, QImage::Format_A2BGR30_Premultiplied); + break; + } + break; case kGray_8_SkColorType: image = toQImage(bitmap, QImage::Format_Grayscale8); break; |