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

Compiler warning fixes for r7235

Browse Source 
git-svn-id: http://skia.googlecode.com/svn/trunk@7237 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
robertphillips@google.com 2013-01-16 19:57:02 +00:00
parent 1c711cabae
commit 914a2f2823
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gm/spritebitmap.cpp
View File

@ -26,7 +26,8 @@ static void draw_2_bitmaps(SkCanvas* canvas, const SkBitmap& bm, bool doClip,
SkAutoCanvasRestore acr(canvas, true);
SkPaint paint;
SkRect clipR = SkRect::MakeXYWH(dx, dy,
SkRect clipR = SkRect::MakeXYWH(SkIntToScalar(dx),
SkIntToScalar(dy),
SkIntToScalar(bm.width()),
SkIntToScalar(bm.height()));

6
tools/PictureRenderer.cpp
View File

@ -190,9 +190,9 @@ void PictureRenderer::resetState() {
}
uint32_t PictureRenderer::recordFlags() {
return kNone_BBoxHierarchyType == (fBBoxHierarchyType ? 0 :
SkPicture::kOptimizeForClippedPlayback_RecordingFlag) |
SkPicture::kUsePathBoundsForClip_RecordingFlag;
return (kNone_BBoxHierarchyType == fBBoxHierarchyType) ? 0 :
(SkPicture::kOptimizeForClippedPlayback_RecordingFlag |
SkPicture::kUsePathBoundsForClip_RecordingFlag);
}
/**