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

Side by Side Diff: src/core/SkImageInfo.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/SkImageGeneratorPriv.h ('k') | src/core/SkLayerInfo.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 2010 Google Inc. 2 * Copyright 2010 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 "SkImageInfo.h" 8 #include "SkImageInfo.h"
9 #include "SkReadBuffer.h" 9 #include "SkReadBuffer.h"
10 #include "SkWriteBuffer.h" 10 #include "SkWriteBuffer.h"
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 #include "SkReadPixelsRec.h" 83 #include "SkReadPixelsRec.h"
84 84
85 bool SkReadPixelsRec::trim(int srcWidth, int srcHeight) { 85 bool SkReadPixelsRec::trim(int srcWidth, int srcHeight) {
86 switch (fInfo.colorType()) { 86 switch (fInfo.colorType()) {
87 case kUnknown_SkColorType: 87 case kUnknown_SkColorType:
88 case kIndex_8_SkColorType: 88 case kIndex_8_SkColorType:
89 return false; 89 return false;
90 default: 90 default:
91 break; 91 break;
92 } 92 }
93 if (NULL == fPixels || fRowBytes < fInfo.minRowBytes()) { 93 if (nullptr == fPixels || fRowBytes < fInfo.minRowBytes()) {
94 return false; 94 return false;
95 } 95 }
96 if (0 == fInfo.width() || 0 == fInfo.height()) { 96 if (0 == fInfo.width() || 0 == fInfo.height()) {
97 return false; 97 return false;
98 } 98 }
99 99
100 int x = fX; 100 int x = fX;
101 int y = fY; 101 int y = fY;
102 SkIRect srcR = SkIRect::MakeXYWH(x, y, fInfo.width(), fInfo.height()); 102 SkIRect srcR = SkIRect::MakeXYWH(x, y, fInfo.width(), fInfo.height());
103 if (!srcR.intersect(0, 0, srcWidth, srcHeight)) { 103 if (!srcR.intersect(0, 0, srcWidth, srcHeight)) {
(...skipping 10 matching lines...) Expand all
114 // here x,y are either 0 or negative 114 // here x,y are either 0 or negative
115 fPixels = ((char*)fPixels - y * fRowBytes - x * fInfo.bytesPerPixel()); 115 fPixels = ((char*)fPixels - y * fRowBytes - x * fInfo.bytesPerPixel());
116 // the intersect may have shrunk info's logical size 116 // the intersect may have shrunk info's logical size
117 fInfo = fInfo.makeWH(srcR.width(), srcR.height()); 117 fInfo = fInfo.makeWH(srcR.width(), srcR.height());
118 fX = srcR.x(); 118 fX = srcR.x();
119 fY = srcR.y(); 119 fY = srcR.y();
120 120
121 return true; 121 return true;
122 } 122 }
123 123
OLDNEW
« no previous file with comments | « src/core/SkImageGeneratorPriv.h ('k') | src/core/SkLayerInfo.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698