diff options
| author |  mike@reedtribe.org <mike@reedtribe.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-02-11 02:40:11 +0000 |
|---|---|---|
| committer | mike@reedtribe.org <mike@reedtribe.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-02-11 02:40:11 +0000 |
| commit | c9114856e8e1b94b55725a4d86ef80bd3a76187b (patch) | |
| tree | dfb6f72165521987ab5d29a991086d31d75b2f9c | |
| parent | 169a0ed50a5e451711c341795572e7177a540a24 (diff) | |
fix warnings
BUG=skia:
Review URL: https://codereview.chromium.org/153003005
git-svn-id: http://skia.googlecode.com/svn/trunk@13392 2bbb7eff-a529-9590-31e7-b0007b416f81
| -rw-r--r-- | src/core/SkBitmap.cpp | 2 | ||||
| -rw-r--r-- | src/images/SkDecodingImageGenerator.cpp | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/src/core/SkBitmap.cpp b/src/core/SkBitmap.cpp index eddfd31939..9139f78719 100644 --- a/src/core/SkBitmap.cpp +++ b/src/core/SkBitmap.cpp @@ -259,7 +259,7 @@ bool SkBitmap::setConfig(const SkImageInfo& info, size_t rowBytes) { if ((int32_t)mrb != mrb) { return reset_return_false(this); } - if ((ssize_t)rowBytes != (int32_t)rowBytes) { + if ((int64_t)rowBytes != (int32_t)rowBytes) { return reset_return_false(this); } diff --git a/src/images/SkDecodingImageGenerator.cpp b/src/images/SkDecodingImageGenerator.cpp index 96c9c30020..1e28136603 100644 --- a/src/images/SkDecodingImageGenerator.cpp +++ b/src/images/SkDecodingImageGenerator.cpp @@ -275,10 +275,6 @@ SkImageGenerator* SkDecodingImageGenerator::Create( info.fHeight = bitmap.height(); info.fColorType = opts.fRequestedColorType; info.fAlphaType = bitmap.alphaType(); - - // Sanity check. - SkDEBUGCODE(SkColorType tmp;) - SkASSERT(tmp == opts.fRequestedColorType); } return SkNEW_ARGS(SkDecodingImageGenerator, (data, autoStream.detach(), info, |