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

Side by Side Diff: src/utils/SkPatchGrid.cpp

Issue 544233002: "NULL !=" = NULL (Closed) Base URL: https://skia.googlesource.com/skia.git@are
Patch Set: rebase Created 6 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/utils/SkLua.cpp ('k') | src/utils/SkPatchUtils.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 2014 Google Inc. 2 * Copyright 2014 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 "SkPatchGrid.h" 8 #include "SkPatchGrid.h"
9 #include "SkPatchUtils.h" 9 #include "SkPatchUtils.h"
10 10
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 fHrzCtrlPts[hrzPos + (fCols * 2) + 1] = cubics[SkPatchUtils::kBottomP2_Cubic CtrlPts]; 52 fHrzCtrlPts[hrzPos + (fCols * 2) + 1] = cubics[SkPatchUtils::kBottomP2_Cubic CtrlPts];
53 53
54 // set vertical control points 54 // set vertical control points
55 int vrtPos = (y*2) * (fCols + 1) + x; 55 int vrtPos = (y*2) * (fCols + 1) + x;
56 fVrtCtrlPts[vrtPos] = cubics[SkPatchUtils::kLeftP1_CubicCtrlPts]; 56 fVrtCtrlPts[vrtPos] = cubics[SkPatchUtils::kLeftP1_CubicCtrlPts];
57 fVrtCtrlPts[vrtPos + 1] = cubics[SkPatchUtils::kRightP1_CubicCtrlPts]; 57 fVrtCtrlPts[vrtPos + 1] = cubics[SkPatchUtils::kRightP1_CubicCtrlPts];
58 fVrtCtrlPts[vrtPos + (fCols + 1)] = cubics[SkPatchUtils::kLeftP2_CubicCtrlPt s]; 58 fVrtCtrlPts[vrtPos + (fCols + 1)] = cubics[SkPatchUtils::kLeftP2_CubicCtrlPt s];
59 fVrtCtrlPts[vrtPos + (fCols + 1) + 1] = cubics[SkPatchUtils::kRightP2_CubicC trlPts]; 59 fVrtCtrlPts[vrtPos + (fCols + 1) + 1] = cubics[SkPatchUtils::kRightP2_CubicC trlPts];
60 60
61 // set optional values (colors and texture coordinates) 61 // set optional values (colors and texture coordinates)
62 if ((fModeFlags & kColors_VertexType) && NULL != colors) { 62 if ((fModeFlags & kColors_VertexType) && colors) {
63 fCornerColors[cornerPos] = colors[0]; 63 fCornerColors[cornerPos] = colors[0];
64 fCornerColors[cornerPos + 1] = colors[1]; 64 fCornerColors[cornerPos + 1] = colors[1];
65 fCornerColors[cornerPos + (fCols + 1)] = colors[3]; 65 fCornerColors[cornerPos + (fCols + 1)] = colors[3];
66 fCornerColors[cornerPos + (fCols + 1) + 1] = colors[2]; 66 fCornerColors[cornerPos + (fCols + 1) + 1] = colors[2];
67 } 67 }
68 68
69 if ((fModeFlags & kTexs_VertexType) && NULL != texCoords) { 69 if ((fModeFlags & kTexs_VertexType) && texCoords) {
70 fTexCoords[cornerPos] = texCoords[0]; 70 fTexCoords[cornerPos] = texCoords[0];
71 fTexCoords[cornerPos + 1] = texCoords[1]; 71 fTexCoords[cornerPos + 1] = texCoords[1];
72 fTexCoords[cornerPos + (fCols + 1)] = texCoords[3]; 72 fTexCoords[cornerPos + (fCols + 1)] = texCoords[3];
73 fTexCoords[cornerPos + (fCols + 1) + 1] = texCoords[2]; 73 fTexCoords[cornerPos + (fCols + 1) + 1] = texCoords[2];
74 } 74 }
75 75
76 return true; 76 return true;
77 } 77 }
78 78
79 bool SkPatchGrid::getPatch(int x, int y, SkPoint cubics[12], SkColor colors[4], 79 bool SkPatchGrid::getPatch(int x, int y, SkPoint cubics[12], SkColor colors[4],
(...skipping 15 matching lines...) Expand all
95 cubics[SkPatchUtils::kTopP2_CubicCtrlPts] = fHrzCtrlPts[hrzPos + 1]; 95 cubics[SkPatchUtils::kTopP2_CubicCtrlPts] = fHrzCtrlPts[hrzPos + 1];
96 cubics[SkPatchUtils::kBottomP1_CubicCtrlPts] = fHrzCtrlPts[hrzPos + (fCols * 2)]; 96 cubics[SkPatchUtils::kBottomP1_CubicCtrlPts] = fHrzCtrlPts[hrzPos + (fCols * 2)];
97 cubics[SkPatchUtils::kBottomP2_CubicCtrlPts] = fHrzCtrlPts[hrzPos + (fCols * 2) + 1]; 97 cubics[SkPatchUtils::kBottomP2_CubicCtrlPts] = fHrzCtrlPts[hrzPos + (fCols * 2) + 1];
98 98
99 int vrtPos = (y*2) * (fCols + 1) + x; 99 int vrtPos = (y*2) * (fCols + 1) + x;
100 cubics[SkPatchUtils::kLeftP1_CubicCtrlPts] = fVrtCtrlPts[vrtPos]; 100 cubics[SkPatchUtils::kLeftP1_CubicCtrlPts] = fVrtCtrlPts[vrtPos];
101 cubics[SkPatchUtils::kRightP1_CubicCtrlPts] = fVrtCtrlPts[vrtPos + 1]; 101 cubics[SkPatchUtils::kRightP1_CubicCtrlPts] = fVrtCtrlPts[vrtPos + 1];
102 cubics[SkPatchUtils::kLeftP2_CubicCtrlPts] = fVrtCtrlPts[vrtPos + (fCols + 1 )]; 102 cubics[SkPatchUtils::kLeftP2_CubicCtrlPts] = fVrtCtrlPts[vrtPos + (fCols + 1 )];
103 cubics[SkPatchUtils::kRightP2_CubicCtrlPts] = fVrtCtrlPts[vrtPos + (fCols + 1) + 1]; 103 cubics[SkPatchUtils::kRightP2_CubicCtrlPts] = fVrtCtrlPts[vrtPos + (fCols + 1) + 1];
104 104
105 if ((fModeFlags & kColors_VertexType) && NULL != colors) { 105 if ((fModeFlags & kColors_VertexType) && colors) {
106 colors[0] = fCornerColors[cornerPos]; 106 colors[0] = fCornerColors[cornerPos];
107 colors[1] = fCornerColors[cornerPos + 1]; 107 colors[1] = fCornerColors[cornerPos + 1];
108 colors[3] = fCornerColors[cornerPos + (fCols + 1)]; 108 colors[3] = fCornerColors[cornerPos + (fCols + 1)];
109 colors[2] = fCornerColors[cornerPos + (fCols + 1) + 1]; 109 colors[2] = fCornerColors[cornerPos + (fCols + 1) + 1];
110 } 110 }
111 111
112 if ((fModeFlags & kTexs_VertexType) && NULL != texCoords) { 112 if ((fModeFlags & kTexs_VertexType) && texCoords) {
113 texCoords[0] = fTexCoords[cornerPos]; 113 texCoords[0] = fTexCoords[cornerPos];
114 texCoords[1] = fTexCoords[cornerPos + 1]; 114 texCoords[1] = fTexCoords[cornerPos + 1];
115 texCoords[3] = fTexCoords[cornerPos + (fCols + 1)]; 115 texCoords[3] = fTexCoords[cornerPos + (fCols + 1)];
116 texCoords[2] = fTexCoords[cornerPos + (fCols + 1) + 1]; 116 texCoords[2] = fTexCoords[cornerPos + (fCols + 1) + 1];
117 } 117 }
118 118
119 return true; 119 return true;
120 } 120 }
121 121
122 void SkPatchGrid::reset(int rows, int cols, VertexType flags, SkXfermode* xMode) { 122 void SkPatchGrid::reset(int rows, int cols, VertexType flags, SkXfermode* xMode) {
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 maxCols[x], maxRows[y])) { 180 maxCols[x], maxRows[y])) {
181 canvas->drawVertices(SkCanvas::kTriangles_VertexMode, data.fVert exCount, 181 canvas->drawVertices(SkCanvas::kTriangles_VertexMode, data.fVert exCount,
182 data.fPoints, data.fTexCoords, data.fColors , fXferMode, 182 data.fPoints, data.fTexCoords, data.fColors , fXferMode,
183 data.fIndices, data.fIndexCount, paint); 183 data.fIndices, data.fIndexCount, paint);
184 } 184 }
185 } 185 }
186 } 186 }
187 SkDELETE_ARRAY(maxCols); 187 SkDELETE_ARRAY(maxCols);
188 SkDELETE_ARRAY(maxRows); 188 SkDELETE_ARRAY(maxRows);
189 } 189 }
OLDNEW
« no previous file with comments | « src/utils/SkLua.cpp ('k') | src/utils/SkPatchUtils.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698