vcl/skia/osx/gdiimpl.cxx | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
New commits: commit c7c2b90ad4ed88856699dae2839a3437ec3a9c77 Author: Stephan Bergmann <sberg...@redhat.com> AuthorDate: Fri Aug 27 13:49:55 2021 +0200 Commit: Stephan Bergmann <sberg...@redhat.com> CommitDate: Fri Aug 27 16:20:05 2021 +0200 -Werror,-Wdeprecated-anon-enum-enum-conversion ...similar to 5b8f505cd11517362b2c4a29c87d802a286a677d "Avoid -Werror,-Wdeprecated-anon-enum-enum-conversion" Change-Id: Ia9e8994cdb74ecdb078f347c864a89ad40321609 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121143 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sberg...@redhat.com> diff --git a/vcl/skia/osx/gdiimpl.cxx b/vcl/skia/osx/gdiimpl.cxx index 13a5dd32aa82..c262a93c14fe 100644 --- a/vcl/skia/osx/gdiimpl.cxx +++ b/vcl/skia/osx/gdiimpl.cxx @@ -106,15 +106,16 @@ constexpr static uint32_t toCGBitmapType(SkColorType color, SkAlphaType alpha) if (alpha == kPremul_SkAlphaType) { return color == kBGRA_8888_SkColorType - ? (kCGImageAlphaPremultipliedFirst | kCGBitmapByteOrder32Little) - : (kCGImageAlphaPremultipliedLast | kCGBitmapByteOrder32Big); + ? (uint32_t(kCGImageAlphaPremultipliedFirst) + | uint32_t(kCGBitmapByteOrder32Little)) + : (uint32_t(kCGImageAlphaPremultipliedLast) | uint32_t(kCGBitmapByteOrder32Big)); } else { assert(alpha == kOpaque_SkAlphaType); return color == kBGRA_8888_SkColorType - ? (kCGImageAlphaNoneSkipFirst | kCGBitmapByteOrder32Little) - : (kCGImageAlphaNoneSkipLast | kCGBitmapByteOrder32Big); + ? (uint32_t(kCGImageAlphaNoneSkipFirst) | uint32_t(kCGBitmapByteOrder32Little)) + : (uint32_t(kCGImageAlphaNoneSkipLast) | uint32_t(kCGBitmapByteOrder32Big)); } }