ARM Skia NEON patches - 01 - Simple fixes

include/core/SkFixed.h

 
 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #ifndef SkFixed_DEFINED
@@ skipping 161 matching lines @@
 //////////////////////////////////////////////////////////////////////////////////////////////////////
 // Now look for ASM overrides for our portable versions (should consider putting this in its own file)
 
 #ifdef SkLONGLONG
     inline SkFixed SkFixedMul_longlong(SkFixed a, SkFixed b)
     {
         return (SkFixed)((SkLONGLONG)a * b >> 16);
     }
     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)
     {
         return (SkFixed)((SkLONGLONG)value * value >> 16);
     }
     #define SkFixedMul(a,b)     SkFixedMul_longlong(a,b)
     #define SkFractMul(a,b)     SkFractMul_longlong(a,b)
     #define SkFixedSquare(a)    SkFixedSquare_longlong(a)
 #endif
 
@@ skipping 88 matching lines @@
 #define SkFixed48ToFixed(x)     ((SkFixed)((x) >> 32))
 #define SkFloatToFixed48(x)     ((SkFixed48)((x) * (65536.0f * 65536.0f * 65536.0f)))
 
 #ifdef SK_SCALAR_IS_FLOAT
     #define SkScalarToFixed48(x)    SkFloatToFixed48(x)
 #else
     #define SkScalarToFixed48(x)    SkFixedToFixed48(x)
 #endif
 
 #endif