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

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

Issue 2198263002: Image filters: force near-zero floating point parameters to zero. Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 4 years, 4 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
OLDNEW
1 /* 1 /*
2 * Copyright 2012 The Android Open Source Project 2 * Copyright 2012 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 "SkMatrixConvolutionImageFilter.h" 8 #include "SkMatrixConvolutionImageFilter.h"
9 #include "SkBitmap.h" 9 #include "SkBitmap.h"
10 #include "SkColorPriv.h" 10 #include "SkColorPriv.h"
(...skipping 18 matching lines...) Expand all
29 const SkScalar* k ernel, 29 const SkScalar* k ernel,
30 SkScalar gain, 30 SkScalar gain,
31 SkScalar bias, 31 SkScalar bias,
32 const SkIPoint& k ernelOffset, 32 const SkIPoint& k ernelOffset,
33 TileMode tileMode , 33 TileMode tileMode ,
34 bool convolveAlph a, 34 bool convolveAlph a,
35 sk_sp<SkImageFilt er> input, 35 sk_sp<SkImageFilt er> input,
36 const CropRect* c ropRect) 36 const CropRect* c ropRect)
37 : INHERITED(&input, 1, cropRect) 37 : INHERITED(&input, 1, cropRect)
38 , fKernelSize(kernelSize) 38 , fKernelSize(kernelSize)
39 , fGain(gain) 39 , fGain(SkScalarNormalize(gain))
40 , fBias(bias) 40 , fBias(SkScalarNormalize(bias))
41 , fKernelOffset(kernelOffset) 41 , fKernelOffset(kernelOffset)
42 , fTileMode(tileMode) 42 , fTileMode(tileMode)
43 , fConvolveAlpha(convolveAlpha) { 43 , fConvolveAlpha(convolveAlpha) {
44 size_t size = (size_t) sk_64_mul(fKernelSize.width(), fKernelSize.height()); 44 size_t size = (size_t) sk_64_mul(fKernelSize.width(), fKernelSize.height());
45 fKernel = new SkScalar[size]; 45 fKernel = new SkScalar[size];
46 memcpy(fKernel, kernel, size * sizeof(SkScalar)); 46 for (size_t i = 0; i < size; ++i) {
47 fKernel[i] = SkScalarNormalize(kernel[i]);
48 }
47 SkASSERT(kernelSize.fWidth >= 1 && kernelSize.fHeight >= 1); 49 SkASSERT(kernelSize.fWidth >= 1 && kernelSize.fHeight >= 1);
48 SkASSERT(kernelOffset.fX >= 0 && kernelOffset.fX < kernelSize.fWidth); 50 SkASSERT(kernelOffset.fX >= 0 && kernelOffset.fX < kernelSize.fWidth);
49 SkASSERT(kernelOffset.fY >= 0 && kernelOffset.fY < kernelSize.fHeight); 51 SkASSERT(kernelOffset.fY >= 0 && kernelOffset.fY < kernelSize.fHeight);
50 } 52 }
51 53
52 sk_sp<SkImageFilter> SkMatrixConvolutionImageFilter::Make(const SkISize& kernelS ize, 54 sk_sp<SkImageFilter> SkMatrixConvolutionImageFilter::Make(const SkISize& kernelS ize,
53 const SkScalar* kernel , 55 const SkScalar* kernel ,
54 SkScalar gain, 56 SkScalar gain,
55 SkScalar bias, 57 SkScalar bias,
56 const SkIPoint& kernel Offset, 58 const SkIPoint& kernel Offset,
(...skipping 356 matching lines...) Expand 10 before | Expand all | Expand 10 after
413 str->appendf("%f ", fKernel[y * fKernelSize.width() + x]); 415 str->appendf("%f ", fKernel[y * fKernelSize.width() + x]);
414 } 416 }
415 } 417 }
416 str->appendf(")"); 418 str->appendf(")");
417 str->appendf("gain: %f bias: %f ", fGain, fBias); 419 str->appendf("gain: %f bias: %f ", fGain, fBias);
418 str->appendf("offset: (%d, %d) ", fKernelOffset.fX, fKernelOffset.fY); 420 str->appendf("offset: (%d, %d) ", fKernelOffset.fX, fKernelOffset.fY);
419 str->appendf("convolveAlpha: %s", fConvolveAlpha ? "true" : "false"); 421 str->appendf("convolveAlpha: %s", fConvolveAlpha ? "true" : "false");
420 str->append(")"); 422 str->append(")");
421 } 423 }
422 #endif 424 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698