Skip to content

Commit

Permalink
Avoid bitwise operation between different enumeration types.
Browse files Browse the repository at this point in the history
This is deprecated in C++20.

Bug: 1284275
Change-Id: I3e3337a38a451ef8b1388a130c21f5172438e68f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3791648
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Auto-Submit: Peter Kasting <pkasting@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1029313}
  • Loading branch information
pkasting authored and Chromium LUCI CQ committed Jul 28, 2022
1 parent 5ab7dd2 commit 862bd0e
Showing 1 changed file with 2 additions and 7 deletions.
9 changes: 2 additions & 7 deletions skia/ext/skia_utils_ios.mm
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,8 @@ SkBitmap CGImageToSkBitmap(CGImageRef image, CGSize size, bool is_opaque) {
base::ScopedCFTypeRef<CGColorSpaceRef> color_space(
CGColorSpaceCreateDeviceRGB());
base::ScopedCFTypeRef<CGContextRef> context(CGBitmapContextCreate(
data,
size.width,
size.height,
8,
size.width * 4,
color_space,
kCGImageAlphaPremultipliedFirst | kCGBitmapByteOrder32Host));
data, size.width, size.height, 8, size.width * 4, color_space,
uint32_t{kCGImageAlphaPremultipliedFirst} | kCGBitmapByteOrder32Host));
#else
#error We require that Skia's and CoreGraphics's recommended \
image memory layout match.
Expand Down

0 comments on commit 862bd0e

Please sign in to comment.