diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/SkBitmap.cpp | 4 | ||||
| -rw-r--r-- | src/utils/SkDeferredCanvas.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/core/SkBitmap.cpp b/src/core/SkBitmap.cpp index 5554f46ce6..f0dafc17fa 100644 --- a/src/core/SkBitmap.cpp +++ b/src/core/SkBitmap.cpp @@ -701,7 +701,7 @@ bool SkBitmap::ComputeIsOpaque(const SkBitmap& bm) { 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 @@ bool SkBitmap::ComputeIsOpaque(const SkBitmap& bm) { 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 a1e32bc373..26ac088809 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 { |