commit 1cdcb5138f9b70aff547ea1c3af96f0c90b12f8f
author reed@android.com <reed@android.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Aug 24 19:11:00 2009 +0000
committer reed@android.com <reed@android.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Aug 24 19:11:00 2009 +0000
tree 8f8ac608b4fb0581f0cdd78ba6451d0dd10d0d27
parent 69255fb50381dd902c23d7d1baf3fe8b724c6ab1

fix warning in sampler
lock pixels when we extract alpha
disabling hinting when linear-text is set



git-svn-id: http://skia.googlecode.com/svn/trunk@333 2bbb7eff-a529-9590-31e7-b0007b416f81

src/images/SkScaledBitmapSampler.cpp

diff --git a/src/images/SkScaledBitmapSampler.cpp b/src/images/SkScaledBitmapSampler.cpp
index b51b4e7..3ba38f7 100644
--- a/src/images/SkScaledBitmapSampler.cpp
+++ b/src/images/SkScaledBitmapSampler.cpp
@@ -192,7 +192,7 @@
 
 // Index
 
-#define A32_MASK_IN_PLACE   (SK_A32_MASK << SK_A32_SHIFT)
+#define A32_MASK_IN_PLACE   (SkPMColor)(SK_A32_MASK << SK_A32_SHIFT)
 
 static bool Sample_Index_D8888(void* SK_RESTRICT dstRow,
                                const uint8_t* SK_RESTRICT src,