OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "components/suggestions/image_encoder.h" | 5 #include "components/suggestions/image_encoder.h" |
6 | 6 |
7 #include "ui/gfx/codec/jpeg_codec.h" | 7 #include "ui/gfx/codec/jpeg_codec.h" |
8 #include "ui/gfx/image/image_skia.h" | 8 #include "ui/gfx/image/image_skia.h" |
9 | 9 |
10 namespace suggestions { | 10 namespace suggestions { |
11 | 11 |
12 SkBitmap* DecodeJPEGToSkBitmap(const std::vector<unsigned char>& encoded_data) { | 12 SkBitmap* DecodeJPEGToSkBitmap(const void* encoded_data, size_t size) { |
13 return gfx::JPEGCodec::Decode(&encoded_data[0], encoded_data.size()); | 13 return gfx::JPEGCodec::Decode(static_cast<const unsigned char*>(encoded_data), |
| 14 size); |
14 } | 15 } |
15 | 16 |
16 bool EncodeSkBitmapToJPEG(const SkBitmap& bitmap, | 17 bool EncodeSkBitmapToJPEG(const SkBitmap& bitmap, |
17 std::vector<unsigned char>* dest) { | 18 std::vector<unsigned char>* dest) { |
18 SkAutoLockPixels bitmap_lock(bitmap); | 19 SkAutoLockPixels bitmap_lock(bitmap); |
19 if (!bitmap.readyToDraw() || bitmap.isNull()) { | 20 if (!bitmap.readyToDraw() || bitmap.isNull()) { |
20 return false; | 21 return false; |
21 } | 22 } |
22 return gfx::JPEGCodec::Encode( | 23 return gfx::JPEGCodec::Encode( |
23 reinterpret_cast<unsigned char*>(bitmap.getAddr32(0, 0)), | 24 reinterpret_cast<unsigned char*>(bitmap.getAddr32(0, 0)), |
24 gfx::JPEGCodec::FORMAT_SkBitmap, bitmap.width(), bitmap.height(), | 25 gfx::JPEGCodec::FORMAT_SkBitmap, bitmap.width(), bitmap.height(), |
25 bitmap.rowBytes(), 100, dest); | 26 bitmap.rowBytes(), 100, dest); |
26 } | 27 } |
27 | 28 |
28 } // namespace suggestions | 29 } // namespace suggestions |
OLD | NEW |