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

Side by Side Diff: src/effects/SkColorFilters.cpp

Issue 1574023002: move declaration of CreateLightingFilter into SkColorMatrixFilter (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: don't remove old impl yet Created 4 years, 11 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 | « samplecode/SampleFilterFuzz.cpp ('k') | src/effects/SkColorMatrixFilter.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 2006 The Android Open Source Project 2 * Copyright 2006 The Android Open Source Project
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 "SkColorFilter.h" 9 #include "SkColorFilter.h"
10 #include "SkColorPriv.h" 10 #include "SkColorPriv.h"
11 #include "SkModeColorFilter.h" 11 #include "SkModeColorFilter.h"
12 #include "SkReadBuffer.h" 12 #include "SkReadBuffer.h"
13 #include "SkWriteBuffer.h" 13 #include "SkWriteBuffer.h"
14 #include "SkUtils.h" 14 #include "SkUtils.h"
15 #include "SkString.h" 15 #include "SkString.h"
16 #include "SkValidationUtils.h" 16 #include "SkValidationUtils.h"
17 #include "SkColorMatrixFilter.h"
18 17
19 bool SkModeColorFilter::asColorMode(SkColor* color, SkXfermode::Mode* mode) cons t { 18 bool SkModeColorFilter::asColorMode(SkColor* color, SkXfermode::Mode* mode) cons t {
20 if (color) { 19 if (color) {
21 *color = fColor; 20 *color = fColor;
22 } 21 }
23 if (mode) { 22 if (mode) {
24 *mode = fMode; 23 *mode = fMode;
25 } 24 }
26 return true; 25 return true;
27 } 26 }
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
162 161
163 switch (mode) { 162 switch (mode) {
164 case SkXfermode::kSrc_Mode: 163 case SkXfermode::kSrc_Mode:
165 return new Src_SkModeColorFilter(color); 164 return new Src_SkModeColorFilter(color);
166 case SkXfermode::kSrcOver_Mode: 165 case SkXfermode::kSrcOver_Mode:
167 return new SrcOver_SkModeColorFilter(color); 166 return new SrcOver_SkModeColorFilter(color);
168 default: 167 default:
169 return SkModeColorFilter::Create(color, mode); 168 return SkModeColorFilter::Create(color, mode);
170 } 169 }
171 } 170 }
172
173 ///////////////////////////////////////////////////////////////////////////////
174
175 static SkScalar byte_to_scale(U8CPU byte) {
176 if (0xFF == byte) {
177 // want to get this exact
178 return 1;
179 } else {
180 return byte * 0.00392156862745f;
181 }
182 }
183
184 SkColorFilter* SkColorFilter::CreateLightingFilter(SkColor mul, SkColor add) {
185 SkColorMatrix matrix;
186 matrix.setScale(byte_to_scale(SkColorGetR(mul)),
187 byte_to_scale(SkColorGetG(mul)),
188 byte_to_scale(SkColorGetB(mul)),
189 1);
190 matrix.postTranslate(SkIntToScalar(SkColorGetR(add)),
191 SkIntToScalar(SkColorGetG(add)),
192 SkIntToScalar(SkColorGetB(add)),
193 0);
194 return SkColorMatrixFilter::Create(matrix);
195 }
196
OLDNEW
« no previous file with comments | « samplecode/SampleFilterFuzz.cpp ('k') | src/effects/SkColorMatrixFilter.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698