fix warnings
Review URL: https://codereview.appspot.com/7073044
git-svn-id: http://skia.googlecode.com/svn/trunk@7064 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/core/SkBitmap.cpp b/src/core/SkBitmap.cpp
index 5554f46..f0dafc1 100644
--- a/src/core/SkBitmap.cpp
+++ b/src/core/SkBitmap.cpp
@@ -701,7 +701,7 @@
if (!table) {
return false;
}
- SkPMColor c = ~0;
+ SkPMColor c = (SkPMColor)~0;
for (int i = bm.getColorTable()->count() - 1; i >= 0; --i) {
c &= table[i];
}
@@ -724,7 +724,7 @@
return true;
} break;
case SkBitmap::kARGB_8888_Config: {
- SkPMColor c = ~0;
+ SkPMColor c = (SkPMColor)~0;
for (int y = 0; y < height; ++y) {
const SkPMColor* row = bm.getAddr32(0, y);
for (int x = 0; x < width; ++x) {
diff --git a/src/utils/SkDeferredCanvas.cpp b/src/utils/SkDeferredCanvas.cpp
index a1e32bc..26ac088 100644
--- a/src/utils/SkDeferredCanvas.cpp
+++ b/src/utils/SkDeferredCanvas.cpp
@@ -20,7 +20,7 @@
enum {
// Deferred canvas will auto-flush when recording reaches this limit
kDefaultMaxRecordingStorageBytes = 64*1024*1024,
- kDeferredCanvasBitmapSizeThreshold = ~0, // Disables this feature
+ kDeferredCanvasBitmapSizeThreshold = ~0U, // Disables this feature
};
enum PlaybackMode {