diff options
author | 2013-01-16 19:57:02 +0000 | |
---|---|---|
committer | 2013-01-16 19:57:02 +0000 | |
commit | 914a2f282318b60da05c243793056ae0664f574e (patch) | |
tree | dae794e7332721675e30372bb202e2a040866539 | |
parent | 1c711cabae03025f6732a82b28de0a51cda63a79 (diff) |
Compiler warning fixes for r7235
git-svn-id: http://skia.googlecode.com/svn/trunk@7237 2bbb7eff-a529-9590-31e7-b0007b416f81
-rw-r--r-- | gm/spritebitmap.cpp | 3 | ||||
-rw-r--r-- | tools/PictureRenderer.cpp | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/gm/spritebitmap.cpp b/gm/spritebitmap.cpp index aa5f6208fb..a073c02f3b 100644 --- a/gm/spritebitmap.cpp +++ b/gm/spritebitmap.cpp @@ -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())); diff --git a/tools/PictureRenderer.cpp b/tools/PictureRenderer.cpp index 08f85a435d..3fc143c38d 100644 --- a/tools/PictureRenderer.cpp +++ b/tools/PictureRenderer.cpp @@ -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); } /** |