diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 08:38:03 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-01-13 16:11:53 +0100 |
| commit | ffb13e6927ae14a7185bb45ee0dfd03973e5ebb0 (patch) | |
| tree | 1a00d0b9a36f2406056db01a228dd1ed00408361 /src/core/type_conversion.cpp | |
| parent | 0970b75122c51bb621b9435aa558b2c74ff52e9f (diff) | |
Adaptations for Chromium 85
Change-Id: I33c1af7c431055d95e0fb540246765cce684de15
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
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 1d8d63257..3723f97ea 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; |