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

Side by Side Diff: src/core/SkBitmapProcState_sample.h

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/SkBitmapProcState.cpp ('k') | src/core/SkBitmapProcState_shaderproc.h » ('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 "SkUtils.h" 8 #include "SkUtils.h"
9 9
10 #if DSTSIZE==32 10 #if DSTSIZE==32
(...skipping 23 matching lines...) Expand all
34 void MAKENAME(_filter_DX)(const SkBitmapProcState& s, 34 void MAKENAME(_filter_DX)(const SkBitmapProcState& s,
35 const uint32_t* SK_RESTRICT xy, 35 const uint32_t* SK_RESTRICT xy,
36 int count, DSTTYPE* SK_RESTRICT colors); 36 int count, DSTTYPE* SK_RESTRICT colors);
37 void MAKENAME(_filter_DXDY)(const SkBitmapProcState& s, 37 void MAKENAME(_filter_DXDY)(const SkBitmapProcState& s,
38 const uint32_t* SK_RESTRICT xy, 38 const uint32_t* SK_RESTRICT xy,
39 int count, DSTTYPE* SK_RESTRICT colors); 39 int count, DSTTYPE* SK_RESTRICT colors);
40 40
41 void MAKENAME(_nofilter_DXDY)(const SkBitmapProcState& s, 41 void MAKENAME(_nofilter_DXDY)(const SkBitmapProcState& s,
42 const uint32_t* SK_RESTRICT xy, 42 const uint32_t* SK_RESTRICT xy,
43 int count, DSTTYPE* SK_RESTRICT colors) { 43 int count, DSTTYPE* SK_RESTRICT colors) {
44 SkASSERT(count > 0 && colors != NULL); 44 SkASSERT(count > 0 && colors != nullptr);
45 SkASSERT(kNone_SkFilterQuality == s.fFilterLevel); 45 SkASSERT(kNone_SkFilterQuality == s.fFilterLevel);
46 SkDEBUGCODE(CHECKSTATE(s);) 46 SkDEBUGCODE(CHECKSTATE(s);)
47 47
48 #ifdef PREAMBLE 48 #ifdef PREAMBLE
49 PREAMBLE(s); 49 PREAMBLE(s);
50 #endif 50 #endif
51 const char* SK_RESTRICT srcAddr = (const char*)s.fPixmap.addr(); 51 const char* SK_RESTRICT srcAddr = (const char*)s.fPixmap.addr();
52 size_t rb = s.fPixmap.rowBytes(); 52 size_t rb = s.fPixmap.rowBytes();
53 53
54 uint32_t XY; 54 uint32_t XY;
(...skipping 21 matching lines...) Expand all
76 } 76 }
77 77
78 #ifdef POSTAMBLE 78 #ifdef POSTAMBLE
79 POSTAMBLE(s); 79 POSTAMBLE(s);
80 #endif 80 #endif
81 } 81 }
82 82
83 void MAKENAME(_nofilter_DX)(const SkBitmapProcState& s, 83 void MAKENAME(_nofilter_DX)(const SkBitmapProcState& s,
84 const uint32_t* SK_RESTRICT xy, 84 const uint32_t* SK_RESTRICT xy,
85 int count, DSTTYPE* SK_RESTRICT colors) { 85 int count, DSTTYPE* SK_RESTRICT colors) {
86 SkASSERT(count > 0 && colors != NULL); 86 SkASSERT(count > 0 && colors != nullptr);
87 SkASSERT(s.fInvType <= (SkMatrix::kTranslate_Mask | SkMatrix::kScale_Mask)); 87 SkASSERT(s.fInvType <= (SkMatrix::kTranslate_Mask | SkMatrix::kScale_Mask));
88 SkASSERT(kNone_SkFilterQuality == s.fFilterLevel); 88 SkASSERT(kNone_SkFilterQuality == s.fFilterLevel);
89 SkDEBUGCODE(CHECKSTATE(s);) 89 SkDEBUGCODE(CHECKSTATE(s);)
90 90
91 #ifdef PREAMBLE 91 #ifdef PREAMBLE
92 PREAMBLE(s); 92 PREAMBLE(s);
93 #endif 93 #endif
94 const SRCTYPE* SK_RESTRICT srcAddr = (const SRCTYPE*)s.fPixmap.addr(); 94 const SRCTYPE* SK_RESTRICT srcAddr = (const SRCTYPE*)s.fPixmap.addr();
95 95
96 // buffer is y32, x16, x16, x16, x16, x16 96 // buffer is y32, x16, x16, x16, x16, x16
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
131 #ifdef POSTAMBLE 131 #ifdef POSTAMBLE
132 POSTAMBLE(s); 132 POSTAMBLE(s);
133 #endif 133 #endif
134 } 134 }
135 135
136 /////////////////////////////////////////////////////////////////////////////// 136 ///////////////////////////////////////////////////////////////////////////////
137 137
138 void MAKENAME(_filter_DX)(const SkBitmapProcState& s, 138 void MAKENAME(_filter_DX)(const SkBitmapProcState& s,
139 const uint32_t* SK_RESTRICT xy, 139 const uint32_t* SK_RESTRICT xy,
140 int count, DSTTYPE* SK_RESTRICT colors) { 140 int count, DSTTYPE* SK_RESTRICT colors) {
141 SkASSERT(count > 0 && colors != NULL); 141 SkASSERT(count > 0 && colors != nullptr);
142 SkASSERT(s.fFilterLevel != kNone_SkFilterQuality); 142 SkASSERT(s.fFilterLevel != kNone_SkFilterQuality);
143 SkDEBUGCODE(CHECKSTATE(s);) 143 SkDEBUGCODE(CHECKSTATE(s);)
144 144
145 #ifdef PREAMBLE 145 #ifdef PREAMBLE
146 PREAMBLE(s); 146 PREAMBLE(s);
147 #endif 147 #endif
148 const char* SK_RESTRICT srcAddr = (const char*)s.fPixmap.addr(); 148 const char* SK_RESTRICT srcAddr = (const char*)s.fPixmap.addr();
149 size_t rb = s.fPixmap.rowBytes(); 149 size_t rb = s.fPixmap.rowBytes();
150 unsigned subY; 150 unsigned subY;
151 const SRCTYPE* SK_RESTRICT row0; 151 const SRCTYPE* SK_RESTRICT row0;
(...skipping 25 matching lines...) Expand all
177 177
178 } while (--count != 0); 178 } while (--count != 0);
179 179
180 #ifdef POSTAMBLE 180 #ifdef POSTAMBLE
181 POSTAMBLE(s); 181 POSTAMBLE(s);
182 #endif 182 #endif
183 } 183 }
184 void MAKENAME(_filter_DXDY)(const SkBitmapProcState& s, 184 void MAKENAME(_filter_DXDY)(const SkBitmapProcState& s,
185 const uint32_t* SK_RESTRICT xy, 185 const uint32_t* SK_RESTRICT xy,
186 int count, DSTTYPE* SK_RESTRICT colors) { 186 int count, DSTTYPE* SK_RESTRICT colors) {
187 SkASSERT(count > 0 && colors != NULL); 187 SkASSERT(count > 0 && colors != nullptr);
188 SkASSERT(s.fFilterLevel != kNone_SkFilterQuality); 188 SkASSERT(s.fFilterLevel != kNone_SkFilterQuality);
189 SkDEBUGCODE(CHECKSTATE(s);) 189 SkDEBUGCODE(CHECKSTATE(s);)
190 190
191 #ifdef PREAMBLE 191 #ifdef PREAMBLE
192 PREAMBLE(s); 192 PREAMBLE(s);
193 #endif 193 #endif
194 const char* SK_RESTRICT srcAddr = (const char*)s.fPixmap.addr(); 194 const char* SK_RESTRICT srcAddr = (const char*)s.fPixmap.addr();
195 size_t rb = s.fPixmap.rowBytes(); 195 size_t rb = s.fPixmap.rowBytes();
196 196
197 do { 197 do {
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
239 #ifdef POSTAMBLE 239 #ifdef POSTAMBLE
240 #undef POSTAMBLE 240 #undef POSTAMBLE
241 #endif 241 #endif
242 242
243 #undef FILTER_PROC_TYPE 243 #undef FILTER_PROC_TYPE
244 #undef GET_FILTER_TABLE 244 #undef GET_FILTER_TABLE
245 #undef GET_FILTER_ROW 245 #undef GET_FILTER_ROW
246 #undef GET_FILTER_ROW_PROC 246 #undef GET_FILTER_ROW_PROC
247 #undef GET_FILTER_PROC 247 #undef GET_FILTER_PROC
248 #undef BITMAPPROC_MEMSET 248 #undef BITMAPPROC_MEMSET
OLDNEW
« no previous file with comments | « src/core/SkBitmapProcState.cpp ('k') | src/core/SkBitmapProcState_shaderproc.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698