commit f267c1efe7de7a8e71404afde6cbf93c3808d267
author bsalomon <bsalomon@google.com> Mon Feb 01 13:16:14 2016 -0800
committer Commit bot <commit-bot@chromium.org> Mon Feb 01 13:16:14 2016 -0800
tree 3ca07e8c6e5526ccfe4166953631006dd8b71845
parent 9d02b264b72be64702e43cb797b7899a8a6926ca

Add ability to extract YUV planes from SkImage

GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1513393002

Review URL: https://codereview.chromium.org/1513393002

src/core/SkColorMatrixFilterRowMajor255.cpp

diff --git a/src/core/SkColorMatrixFilterRowMajor255.cpp b/src/core/SkColorMatrixFilterRowMajor255.cpp
index 6fdfa0b..9106a27 100644
--- a/src/core/SkColorMatrixFilterRowMajor255.cpp
+++ b/src/core/SkColorMatrixFilterRowMajor255.cpp
@@ -32,10 +32,8 @@
     }
 }
 
-// src is [20] but some compilers won't accept __restrict__ on anything
-// but an raw pointer or reference
-void SkColorMatrixFilterRowMajor255::initState(const SkScalar* SK_RESTRICT src) {
-    transpose_to_pmorder(fTranspose, src);
+void SkColorMatrixFilterRowMajor255::initState() {
+    transpose_to_pmorder(fTranspose, fMatrix);
 
     const float* array = fMatrix;
 
@@ -55,7 +53,7 @@
 
 SkColorMatrixFilterRowMajor255::SkColorMatrixFilterRowMajor255(const SkScalar array[20]) {
     memcpy(fMatrix, array, 20 * sizeof(SkScalar));
-    this->initState(array);
+    this->initState();
 }
 
 uint32_t SkColorMatrixFilterRowMajor255::getFlags() const {
@@ -420,3 +418,16 @@
 SkColorFilter* SkColorFilter::CreateMatrixFilterRowMajor255(const SkScalar array[20]) {
     return new SkColorMatrixFilterRowMajor255(array);
 }
+
+///////////////////////////////////////////////////////////////////////////////
+
+SkColorFilter* SkColorMatrixFilterRowMajor255::CreateSingleChannelOutput(const SkScalar row[5]) {
+    SkASSERT(row);
+    SkColorMatrixFilterRowMajor255* cf = new SkColorMatrixFilterRowMajor255();
+    static_assert(sizeof(SkScalar) * 5 * 4 == sizeof(cf->fMatrix), "sizes don't match");
+    for (int i = 0; i < 4; ++i) {
+        memcpy(cf->fMatrix + 5 * i, row, sizeof(SkScalar) * 5);
+    }
+    cf->initState();
+    return cf;
+}