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

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

Issue 1316233002: Style Change: NULL->nullptr (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: 2015-08-27 (Thursday) 10:25:06 EDT Created 5 years, 3 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 | « src/core/SkBlitMask_D32.cpp ('k') | src/core/SkBlitRow_D32.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 2011 Google Inc. 2 * Copyright 2011 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 "SkBlitRow.h" 8 #include "SkBlitRow.h"
9 #include "SkColorPriv.h" 9 #include "SkColorPriv.h"
10 #include "SkDither.h" 10 #include "SkDither.h"
(...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after
239 S32A_D565_Opaque_Dither, 239 S32A_D565_Opaque_Dither,
240 S32A_D565_Blend_Dither 240 S32A_D565_Blend_Dither
241 }; 241 };
242 242
243 SkBlitRow::Proc16 SkBlitRow::Factory16(unsigned flags) { 243 SkBlitRow::Proc16 SkBlitRow::Factory16(unsigned flags) {
244 SkASSERT(flags < SK_ARRAY_COUNT(gDefault_565_Procs)); 244 SkASSERT(flags < SK_ARRAY_COUNT(gDefault_565_Procs));
245 // just so we don't crash 245 // just so we don't crash
246 flags &= kFlags16_Mask; 246 flags &= kFlags16_Mask;
247 247
248 SkBlitRow::Proc16 proc = PlatformFactory565(flags); 248 SkBlitRow::Proc16 proc = PlatformFactory565(flags);
249 if (NULL == proc) { 249 if (nullptr == proc) {
250 proc = gDefault_565_Procs[flags]; 250 proc = gDefault_565_Procs[flags];
251 } 251 }
252 return proc; 252 return proc;
253 } 253 }
254 254
255 static const SkBlitRow::ColorProc16 gDefault_565_ColorProcs[] = { 255 static const SkBlitRow::ColorProc16 gDefault_565_ColorProcs[] = {
256 #if 0 256 #if 0
257 Color32A_D565, 257 Color32A_D565,
258 Color32A_D565_Dither 258 Color32A_D565_Dither
259 #else 259 #else
260 // TODO: stop cheating and fill dither from the above specializations! 260 // TODO: stop cheating and fill dither from the above specializations!
261 Color32A_D565, 261 Color32A_D565,
262 Color32A_D565, 262 Color32A_D565,
263 #endif 263 #endif
264 }; 264 };
265 265
266 SkBlitRow::ColorProc16 SkBlitRow::ColorFactory16(unsigned flags) { 266 SkBlitRow::ColorProc16 SkBlitRow::ColorFactory16(unsigned flags) {
267 SkASSERT((flags & ~kFlags16_Mask) == 0); 267 SkASSERT((flags & ~kFlags16_Mask) == 0);
268 // just so we don't crash 268 // just so we don't crash
269 flags &= kFlags16_Mask; 269 flags &= kFlags16_Mask;
270 // we ignore both kGlobalAlpha_Flag and kSrcPixelAlpha_Flag, so shift down 270 // we ignore both kGlobalAlpha_Flag and kSrcPixelAlpha_Flag, so shift down
271 // no need for the additional code specializing on opaque alpha at this time 271 // no need for the additional code specializing on opaque alpha at this time
272 flags >>= 2; 272 flags >>= 2;
273 273
274 SkASSERT(flags < SK_ARRAY_COUNT(gDefault_565_ColorProcs)); 274 SkASSERT(flags < SK_ARRAY_COUNT(gDefault_565_ColorProcs));
275 275
276 SkBlitRow::ColorProc16 proc = PlatformColorFactory565(flags); 276 SkBlitRow::ColorProc16 proc = PlatformColorFactory565(flags);
277 if (NULL == proc) { 277 if (nullptr == proc) {
278 proc = gDefault_565_ColorProcs[flags]; 278 proc = gDefault_565_ColorProcs[flags];
279 } 279 }
280 return proc; 280 return proc;
281 } 281 }
OLDNEW
« no previous file with comments | « src/core/SkBlitMask_D32.cpp ('k') | src/core/SkBlitRow_D32.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698