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

Side by Side Diff: src/core/SkBitmapScaler.cpp

Issue 2075853002: remove colorprofiletype from imageinfo (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: continue writing an enum, with forward-mode for flattening the actual profile Created 4 years, 6 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 | « include/core/SkImageInfo.h ('k') | src/core/SkBlitter.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2015 Google Inc. 2 * Copyright 2015 Google Inc.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 #include "SkBitmapScaler.h" 8 #include "SkBitmapScaler.h"
9 #include "SkBitmapFilter.h" 9 #include "SkBitmapFilter.h"
10 #include "SkConvolver.h" 10 #include "SkConvolver.h"
(...skipping 234 matching lines...) Expand 10 before | Expand all | Expand 10 after
245 bool SkBitmapScaler::Resize(SkBitmap* resultPtr, const SkPixmap& source, ResizeM ethod method, 245 bool SkBitmapScaler::Resize(SkBitmap* resultPtr, const SkPixmap& source, ResizeM ethod method,
246 int destWidth, int destHeight, SkBitmap::Allocator* allocator) { 246 int destWidth, int destHeight, SkBitmap::Allocator* allocator) {
247 // Preflight some of the checks, to avoid allocating the result if we don't need it. 247 // Preflight some of the checks, to avoid allocating the result if we don't need it.
248 if (!valid_for_resize(source, destWidth, destHeight)) { 248 if (!valid_for_resize(source, destWidth, destHeight)) {
249 return false; 249 return false;
250 } 250 }
251 251
252 SkBitmap result; 252 SkBitmap result;
253 // Note: pass along the profile information even thought this is no the righ t answer because 253 // Note: pass along the profile information even thought this is no the righ t answer because
254 // this could be scaling in sRGB. 254 // this could be scaling in sRGB.
255 result.setInfo(SkImageInfo::MakeN32(destWidth, destHeight, 255 result.setInfo(SkImageInfo::MakeN32(destWidth, destHeight, source.alphaType( ),
256 source.alphaType(), source.info().profil eType())); 256 sk_ref_sp(source.info().colorSpace())));
257 result.allocPixels(allocator, nullptr); 257 result.allocPixels(allocator, nullptr);
258 258
259 SkPixmap resultPM; 259 SkPixmap resultPM;
260 if (!result.peekPixels(&resultPM) || !Resize(resultPM, source, method)) { 260 if (!result.peekPixels(&resultPM) || !Resize(resultPM, source, method)) {
261 return false; 261 return false;
262 } 262 }
263 263
264 *resultPtr = result; 264 *resultPtr = result;
265 resultPtr->lockPixels(); 265 resultPtr->lockPixels();
266 SkASSERT(resultPtr->getPixels()); 266 SkASSERT(resultPtr->getPixels());
267 return true; 267 return true;
268 } 268 }
OLDNEW
« no previous file with comments | « include/core/SkImageInfo.h ('k') | src/core/SkBlitter.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698