Use ColorFilter::Matrix() instead of ColorFilter::Luma(). (#2523)

Tencent · Oct 10, 2024 · 8af2d07 · 8af2d07
1 parent 8aab41f
commit 8af2d07
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/src/rendering/graphics/Modifier.cpp b/src/rendering/graphics/Modifier.cpp
@@ -292,7 +292,10 @@ void MaskModifier::applyToGraphic(Canvas* canvas, std::shared_ptr<Graphic> graph
   canvas->concat(matrix);
   tgfx::Paint paint;
   if (useLuma) {
-    shader = shader->makeWithColorFilter(tgfx::ColorFilter::Luma());
+    auto lumaFilter = tgfx::ColorFilter::Matrix(
+        {0,      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0.21260000000000001, 0.71519999999999995,
+         0.0722, 0, 0});
+    shader = shader->makeWithColorFilter(lumaFilter);
   }
   paint.setMaskFilter(tgfx::MaskFilter::MakeShader(std::move(shader), inverted));
   canvas->drawImage(image, &paint);

diff --git a/test/baseline/version.json b/test/baseline/version.json
@@ -8337,7 +8337,7 @@
         "GradientOverlayFilter_Star": "3c6e493e",
         "HueSaturation": "4429f09f",
         "LevelsIndividualFilter": "bd2ee44f",
-        "LogoMipmap": "4b7f3114",
+        "LogoMipmap": "8aab41f8",
         "Mosaic": "48a897dd",
         "MotionBlur_200000": "28826fb2",
         "MotionBlur_600000": "c75e4d74",
@@ -8409,7 +8409,7 @@
         "nextFrame": "6a420423",
         "preFrame": "48a897dd",
         "trackMatte": "088c7e93",
-        "trackMatte_luma": "30dab356",
+        "trackMatte_luma": "8aab41f8",
         "visible": "7f7435d6f"
     },
     "PAGPlayerTest": {