diff options
| author |  robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-07-09 23:19:53 +0000 |
|---|---|---|
| committer | robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-07-09 23:19:53 +0000 |
| commit | ead3b83645722f9102b97f54c54a4a691d67ed72 (patch) | |
| tree | 18eed6a10b12d48bed85d4bf4d47d3dd22f86b6e | |
| parent | b17859133aeb0ebe80805fbd437759e2b956d859 (diff) | |
Fix Win7 compiler errors/warnings for r9945
git-svn-id: http://skia.googlecode.com/svn/trunk@9947 2bbb7eff-a529-9590-31e7-b0007b416f81
| -rw-r--r-- | src/core/SkBitmapFilter.h | 2 | ||||
| -rw-r--r-- | src/opts/SkBitmapFilter_opts_SSE2.cpp | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/core/SkBitmapFilter.h b/src/core/SkBitmapFilter.h index 4a9f78a4a7..bb14290452 100644 --- a/src/core/SkBitmapFilter.h +++ b/src/core/SkBitmapFilter.h @@ -137,7 +137,7 @@ class SkSincFilter: public SkBitmapFilter { x = sk_float_abs(x * fInvWidth); if (x < 1e-5f) return 1.f; if (x > 1.f) return 0.f; - x *= (float) M_PI; + x *= SK_ScalarPI; float sinc = sk_float_sin(x) / x; float lanczos = sk_float_sin(x * tau) / (x * tau); return sinc * lanczos; diff --git a/src/opts/SkBitmapFilter_opts_SSE2.cpp b/src/opts/SkBitmapFilter_opts_SSE2.cpp index b1a07f2844..fe0a242f23 100644 --- a/src/opts/SkBitmapFilter_opts_SSE2.cpp +++ b/src/opts/SkBitmapFilter_opts_SSE2.cpp @@ -148,10 +148,10 @@ void highQualityFilter_ScaleOnly_SSE2(const SkBitmapProcState &s, int x, int y, SkPMColor color = *s.fBitmap->getAddr32(src_x, src_y); - __m128 c = _mm_set_ps(SkGetPackedB32(color), - SkGetPackedG32(color), - SkGetPackedR32(color), - SkGetPackedA32(color)); + __m128 c = _mm_set_ps((float)SkGetPackedB32(color), + (float)SkGetPackedG32(color), + (float)SkGetPackedR32(color), + (float)SkGetPackedA32(color)); __m128 weightVector = _mm_set1_ps(combined_weight); |