| Index: src/opts/SkBlitMask_opts_arm.cpp
|
| diff --git a/src/opts/SkBlitMask_opts_arm.cpp b/src/opts/SkBlitMask_opts_arm.cpp
|
| index 5cac6c8fc75b4d667c2486b9c8dd10ffccd8daba..a8a92ccba14434945aefacc4c9a60aefd0d8c9de 100644
|
| --- a/src/opts/SkBlitMask_opts_arm.cpp
|
| +++ b/src/opts/SkBlitMask_opts_arm.cpp
|
| @@ -1,3 +1,9 @@
|
| +/*
|
| + * Copyright 2014 Google Inc.
|
| + *
|
| + * Use of this source code is governed by a BSD-style license that can be
|
| + * found in the LICENSE file.
|
| + */
|
|
|
| #include "SkColor.h"
|
| #include "SkColorPriv.h"
|
| @@ -5,7 +11,7 @@
|
| #include "SkUtilsArm.h"
|
| #include "SkBlitMask_opts_arm_neon.h"
|
|
|
| -SkBlitMask::ColorProc SkBlitMask::PlatformColorProcs(SkBitmap::Config dstConfig,
|
| +SkBlitMask::ColorProc SkBlitMask::PlatformColorProcs(SkColorType dstCT,
|
| SkMask::Format maskFormat,
|
| SkColor color) {
|
| #if SK_ARM_NEON_IS_NONE
|
| @@ -39,7 +45,7 @@ SkBlitMask::BlitLCD16RowProc SkBlitMask::PlatformBlitRowProcs16(bool isOpaque) {
|
| }
|
| }
|
|
|
| -SkBlitMask::RowProc SkBlitMask::PlatformRowProcs(SkBitmap::Config dstConfig,
|
| +SkBlitMask::RowProc SkBlitMask::PlatformRowProcs(SkColorType dstCT,
|
| SkMask::Format maskFormat,
|
| RowFlags flags) {
|
| return NULL;
|
|
|