aboutsummaryrefslogtreecommitdiffhomepage
path: root/include/effects/SkColorMatrixFilter.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/effects/SkColorMatrixFilter.h')
-rw-r--r--include/effects/SkColorMatrixFilter.h21
1 files changed, 8 insertions, 13 deletions
diff --git a/include/effects/SkColorMatrixFilter.h b/include/effects/SkColorMatrixFilter.h
index 6e74bee315..d71d2ed533 100644
--- a/include/effects/SkColorMatrixFilter.h
+++ b/include/effects/SkColorMatrixFilter.h
@@ -13,25 +13,20 @@
class SK_API SkColorMatrixFilter : public SkColorFilter {
public:
+ static SkColorFilter* Create(const SkColorMatrix& cm) {
+ return SkColorFilter::CreateMatrixFilterRowMajor255(cm.fMat);
+ }
+ static SkColorFilter* Create(const SkScalar array[20]) {
+ return SkColorFilter::CreateMatrixFilterRowMajor255(array);
+ }
+
/**
* Create a colorfilter that multiplies the RGB channels by one color, and
* then adds a second color, pinning the result for each component to
* [0..255]. The alpha components of the mul and add arguments
* are ignored.
*/
- static sk_sp<SkColorFilter> MakeLightingFilter(SkColor mul, SkColor add);
-
-#ifdef SK_SUPPORT_LEGACY_COLORFILTER_PTR
- static SkColorFilter* Create(const SkColorMatrix& cm) {
- return SkColorFilter::MakeMatrixFilterRowMajor255(cm.fMat).release();
- }
- static SkColorFilter* Create(const SkScalar array[20]) {
- return SkColorFilter::MakeMatrixFilterRowMajor255(array).release();
- }
- static SkColorFilter* CreateLightingFilter(SkColor mul, SkColor add) {
- return MakeLightingFilter(mul, add).release();
- }
-#endif
+ static SkColorFilter* CreateLightingFilter(SkColor mul, SkColor add);
};
#endif