aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/opts
diff options
context:
space:
mode:
authorGravatar robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-07-09 23:19:53 +0000
committerGravatar robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-07-09 23:19:53 +0000
commitead3b83645722f9102b97f54c54a4a691d67ed72 (patch)
tree18eed6a10b12d48bed85d4bf4d47d3dd22f86b6e /src/opts
parentb17859133aeb0ebe80805fbd437759e2b956d859 (diff)
Fix Win7 compiler errors/warnings for r9945
git-svn-id: http://skia.googlecode.com/svn/trunk@9947 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/opts')
-rw-r--r--src/opts/SkBitmapFilter_opts_SSE2.cpp8
1 files changed, 4 insertions, 4 deletions
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);