AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix warnings

Browse Source 
BUG=skia:

Review URL: https://codereview.chromium.org/153003005

git-svn-id: http://skia.googlecode.com/svn/trunk@13392 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
mike@reedtribe.org 2014-02-11 02:40:11 +00:00
parent 169a0ed50a
commit c9114856e8
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/SkBitmap.cpp
View File

@ -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);
}

4
src/images/SkDecodingImageGenerator.cpp
View File

@ -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,