add optimization for width==1 bitmaps in shader procs
odd warning fixes and cleanup



git-svn-id: http://skia.googlecode.com/svn/trunk@63 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/effects/SkGradientShader.cpp b/src/effects/SkGradientShader.cpp
index a1674cb..b0d91ee 100644
--- a/src/effects/SkGradientShader.cpp
+++ b/src/effects/SkGradientShader.cpp
@@ -733,7 +733,7 @@
 #ifdef TEST_GRADIENT_DITHER
 static void dither_memset16(uint16_t dst[], uint16_t value, uint16_t other, int count)
 {
-    if ((unsigned)dst & 2)
+    if (reinterpret_cast<uintptr_t>(dst) & 2)
     {
         *dst++ = value;
         count -= 1;