ARM Skia NEON patches - 01 - Simple fixes
This series contains a few fairly non-controversial fixes.
Misc: remove dead references to neon 4444 functions
Misc: avoid the double _neon_neon suffix in the clamp matrix functions.
MAKENAME already adds the _neon suffix
Misc: a few stupid / obvious fixes
BUG=
R=djsollen@google.com
Author: kevin.petit.arm@gmail.com
Review URL: https://chromiumcodereview.appspot.com/18666004
git-svn-id: http://skia.googlecode.com/svn/trunk/include@10072 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/core/SkColorPriv.h b/core/SkColorPriv.h
index fe59b1b..fe4377f 100644
--- a/core/SkColorPriv.h
+++ b/core/SkColorPriv.h
@@ -318,9 +318,9 @@
static inline
SkPMColor SkPremultiplyARGBInline(U8CPU a, U8CPU r, U8CPU g, U8CPU b) {
SkA32Assert(a);
- SkA32Assert(r);
- SkA32Assert(g);
- SkA32Assert(b);
+ SkR32Assert(r);
+ SkG32Assert(g);
+ SkB32Assert(b);
if (a != 255) {
r = SkMulDiv255Round(r, a);
@@ -334,7 +334,6 @@
static inline uint32_t SkAlphaMulQ(uint32_t c, unsigned scale) {
uint32_t mask = gMask_00FF00FF;
-// uint32_t mask = 0xFF00FF;
uint32_t rb = ((c & mask) * scale) >> 8;
uint32_t ag = ((c >> 8) & mask) * scale;
diff --git a/core/SkFixed.h b/core/SkFixed.h
index 0f8f758..ba2479a 100644
--- a/core/SkFixed.h
+++ b/core/SkFixed.h
@@ -179,7 +179,7 @@
}
inline SkFract SkFractMul_longlong(SkFract a, SkFract b)
{
- return (SkFixed)((SkLONGLONG)a * b >> 30);
+ return (SkFract)((SkLONGLONG)a * b >> 30);
}
inline SkFixed SkFixedSquare_longlong(SkFixed value)
{
