Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(436)

Side by Side Diff: components/suggestions/image_encoder_ios.mm

Issue 1879443002: JPEG decoding: replace ownership comments with std::unique_ptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: build fixes Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « components/suggestions/image_encoder.cc ('k') | printing/emf_win.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 <stddef.h> 7 #include <stddef.h>
8 #import <UIKit/UIKit.h> 8 #import <UIKit/UIKit.h>
9 9
10 #include "base/mac/scoped_cftyperef.h" 10 #include "base/mac/scoped_cftyperef.h"
11 #include "base/memory/ptr_util.h"
11 #include "skia/ext/skia_utils_ios.h" 12 #include "skia/ext/skia_utils_ios.h"
12 13
13 namespace suggestions { 14 namespace suggestions {
14 15
15 SkBitmap* DecodeJPEGToSkBitmap(const void* encoded_data, size_t size) { 16 std::unique_ptr<SkBitmap> DecodeJPEGToSkBitmap(const void* encoded_data,
17 size_t size) {
16 NSData* data = [NSData dataWithBytes:encoded_data length:size]; 18 NSData* data = [NSData dataWithBytes:encoded_data length:size];
17 UIImage* image = [UIImage imageWithData:data scale:1.0]; 19 UIImage* image = [UIImage imageWithData:data scale:1.0];
18 return new SkBitmap(skia::CGImageToSkBitmap(image.CGImage, [image size], 20 return base::WrapUnique(
19 YES)); 21 new SkBitmap(skia::CGImageToSkBitmap(image.CGImage, [image size], YES)));
20 } 22 }
21 23
22 bool EncodeSkBitmapToJPEG(const SkBitmap& bitmap, 24 bool EncodeSkBitmapToJPEG(const SkBitmap& bitmap,
23 std::vector<unsigned char>* dest) { 25 std::vector<unsigned char>* dest) {
24 base::ScopedCFTypeRef<CGColorSpaceRef> color_space( 26 base::ScopedCFTypeRef<CGColorSpaceRef> color_space(
25 CGColorSpaceCreateDeviceRGB()); 27 CGColorSpaceCreateDeviceRGB());
26 UIImage* image = 28 UIImage* image =
27 skia::SkBitmapToUIImageWithColorSpace(bitmap, 1 /* scale */, color_space); 29 skia::SkBitmapToUIImageWithColorSpace(bitmap, 1 /* scale */, color_space);
28 NSData* data = UIImageJPEGRepresentation(image, 1.0); 30 NSData* data = UIImageJPEGRepresentation(image, 1.0);
29 const char* bytes = reinterpret_cast<const char*>([data bytes]); 31 const char* bytes = reinterpret_cast<const char*>([data bytes]);
30 dest->assign(bytes, bytes + [data length]); 32 dest->assign(bytes, bytes + [data length]);
31 return true; 33 return true;
32 } 34 }
33 35
34 } // namespace suggestions 36 } // namespace suggestions
OLDNEW
« no previous file with comments | « components/suggestions/image_encoder.cc ('k') | printing/emf_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698