summaryrefslogtreecommitdiff
path: root/chromium/components/user_manager/user_image/user_image.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/components/user_manager/user_image/user_image.cc')
-rw-r--r--chromium/components/user_manager/user_image/user_image.cc11
1 files changed, 3 insertions, 8 deletions
diff --git a/chromium/components/user_manager/user_image/user_image.cc b/chromium/components/user_manager/user_image/user_image.cc
index db293d53b30..55b76866169 100644
--- a/chromium/components/user_manager/user_image/user_image.cc
+++ b/chromium/components/user_manager/user_image/user_image.cc
@@ -27,18 +27,13 @@ scoped_refptr<base::RefCountedBytes> UserImage::Encode(
TRACE_EVENT2("oobe", "UserImage::Encode",
"width", bitmap.width(), "height", bitmap.height());
std::vector<unsigned char> output;
- auto* bitmap_data = reinterpret_cast<unsigned char*>(bitmap.getAddr32(0, 0));
if (image_format == FORMAT_JPEG) {
- if (gfx::JPEGCodec::Encode(
- bitmap_data,
- gfx::JPEGCodec::FORMAT_SkBitmap,
- bitmap.width(),
- bitmap.height(),
- bitmap.width() * bitmap.bytesPerPixel(),
- kDefaultEncodingQuality, &output)) {
+ if (gfx::JPEGCodec::Encode(bitmap, kDefaultEncodingQuality, &output)) {
return base::RefCountedBytes::TakeVector(&output);
}
} else if (image_format == FORMAT_PNG) {
+ auto* bitmap_data =
+ reinterpret_cast<unsigned char*>(bitmap.getAddr32(0, 0));
if (gfx::PNGCodec::Encode(
bitmap_data,
gfx::PNGCodec::FORMAT_SkBitmap,