diff options
| author |  reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-01-07 20:25:04 +0000 |
|---|---|---|
| committer | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-01-07 20:25:04 +0000 |
| commit | 140d7286c5a40058932696eaa28818c313bd2ddf (patch) | |
| tree | f615391da77f01a324e44ab2b92cb5c0314fda29 /src | |
| parent | f286329ad13b43a8e398df3e0c376403882f1690 (diff) | |
fix warnings
Review URL: https://codereview.appspot.com/7073044
git-svn-id: http://skia.googlecode.com/svn/trunk@7064 2bbb7eff-a529-9590-31e7-b0007b416f81
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 { |