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

fix int->scalar warnings

Browse Source 
git-svn-id: http://skia.googlecode.com/svn/trunk@7236 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
reed@google.com 2013-01-16 19:24:15 +00:00
parent 12fa9bad91
commit 1c711cabae
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gm/spritebitmap.cpp
View File

@ -26,7 +26,9 @@ static void draw_2_bitmaps(SkCanvas* canvas, const SkBitmap& bm, bool doClip,
SkAutoCanvasRestore acr(canvas, true);
SkPaint paint;
SkRect clipR = SkRect::MakeXYWH(dx, dy, bm.width(), bm.height());
SkRect clipR = SkRect::MakeXYWH(dx, dy,
SkIntToScalar(bm.width()),
SkIntToScalar(bm.height()));
paint.setImageFilter(filter);
clipR.inset(5, 5);
@ -40,13 +42,13 @@ static void draw_2_bitmaps(SkCanvas* canvas, const SkBitmap& bm, bool doClip,
canvas->restore();
}
canvas->translate(bm.width() + 20, 0);
canvas->translate(SkIntToScalar(bm.width() + 20), 0);
if (doClip) {
canvas->save();
canvas->clipRect(clipR);
}
canvas->drawBitmap(bm, dx, dy, &paint);
canvas->drawBitmap(bm, SkIntToScalar(dx), SkIntToScalar(dy), &paint);
if (doClip) {
canvas->restore();
}