Compiler warning fixes for r7235

git-svn-id: http://skia.googlecode.com/svn/trunk@7237 2bbb7eff-a529-9590-31e7-b0007b416f81

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()));
 

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);
 }
 
 /**