stop calling legacy 255-biased colormatrix
... but keep the apis for now
Bug: skia:4872
Bug: skia:9012
Change-Id: I3a9b0c9194be6897c0e59b7edd972b7218168183
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/211343
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Auto-Submit: Mike Reed <reed@google.com>
diff --git a/gm/colorfilterimagefilter.cpp b/gm/colorfilterimagefilter.cpp
index 38797a0..70f95ef 100644
--- a/gm/colorfilterimagefilter.cpp
+++ b/gm/colorfilterimagefilter.cpp
@@ -20,23 +20,22 @@
#define MARGIN SkIntToScalar(10)
static sk_sp<SkColorFilter> cf_make_brightness(float brightness) {
- SkScalar amount255 = brightness * 255;
- SkScalar matrix[20] = {
- 1, 0, 0, 0, amount255,
- 0, 1, 0, 0, amount255,
- 0, 0, 1, 0, amount255,
+ float matrix[20] = {
+ 1, 0, 0, 0, brightness,
+ 0, 1, 0, 0, brightness,
+ 0, 0, 1, 0, brightness,
0, 0, 0, 1, 0 };
- return SkColorFilters::MatrixRowMajor255(matrix);
+ return SkColorFilters::Matrix(matrix);
}
static sk_sp<SkColorFilter> cf_make_grayscale() {
- SkScalar matrix[20];
- memset(matrix, 0, 20 * sizeof(SkScalar));
+ float matrix[20];
+ memset(matrix, 0, 20 * sizeof(float));
matrix[0] = matrix[5] = matrix[10] = 0.2126f;
matrix[1] = matrix[6] = matrix[11] = 0.7152f;
matrix[2] = matrix[7] = matrix[12] = 0.0722f;
matrix[18] = 1.0f;
- return SkColorFilters::MatrixRowMajor255(matrix);
+ return SkColorFilters::Matrix(matrix);
}
static sk_sp<SkColorFilter> cf_make_colorize(SkColor color) {