Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(761)

Unified Diff: gm/filterbitmap.cpp

Issue 15929006: use inttoscalar to fix warning (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gm/filterbitmap.cpp
diff --git a/gm/filterbitmap.cpp b/gm/filterbitmap.cpp
index 371666dff545f7f12333789093900e1540603e3e..d7e2352fbca045a7b9ce7eb709e93a4f32016e33 100644
--- a/gm/filterbitmap.cpp
+++ b/gm/filterbitmap.cpp
@@ -34,10 +34,10 @@ static void load_bm(SkBitmap* bm) {
}
static SkSize computeSize(const SkBitmap& bm, const SkMatrix& mat) {
- SkRect bounds = { 0, 0, bm.width(), bm.height() };
+ SkRect bounds = SkRect::MakeWH(SkIntToScalar(bm.width()),
+ SkIntToScalar(bm.height()));
mat.mapRect(&bounds);
- return SkSize::Make(SkIntToScalar(bounds.width()),
- SkIntToScalar(bounds.height()));
+ return SkSize::Make(bounds.width(), bounds.height());
}
static void draw_col(SkCanvas* canvas, const SkBitmap& bm, const SkMatrix& mat,
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698