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
diff --git a/src/core/SkBitmap.cpp b/src/core/SkBitmap.cpp
index eddfd31..9139f78 100644
--- a/src/core/SkBitmap.cpp
+++ b/src/core/SkBitmap.cpp
@@ -259,7 +259,7 @@
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 96c9c30..1e28136 100644
--- a/src/images/SkDecodingImageGenerator.cpp
+++ b/src/images/SkDecodingImageGenerator.cpp
@@ -275,10 +275,6 @@
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,