commit fa25d478110dce4e567e6ff90872bd0f7455342e
author halcanary@google.com <halcanary@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Oct 04 14:35:38 2013 +0000
committer halcanary@google.com <halcanary@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Oct 04 14:35:38 2013 +0000
tree 645d37fc8e71cba7ab9857fe55c928e5a4b3f5c9
parent e14e5f04d98bae0a3942673f4dd05804bc1577bd

Fix SkScalar conversion warning error.

This was causing probems on the Win build.

R=caryclark@google.com

Review URL: https://codereview.chromium.org/26011002

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

images/SkImageDecoder_libjpeg.cpp

diff --git a/images/SkImageDecoder_libjpeg.cpp b/images/SkImageDecoder_libjpeg.cpp
index 7652249..3e34a27 100644
--- a/images/SkImageDecoder_libjpeg.cpp
+++ b/images/SkImageDecoder_libjpeg.cpp
@@ -474,9 +474,9 @@
    Used when decoding fails partway through reading scanlines to fill
    remaining lines. */
 static void fill_below_level(int y, SkBitmap* bitmap) {
-    SkRect rect = SkRect::MakeLTRB(0, y, bitmap->width(), bitmap->height());
+    SkIRect rect = SkIRect::MakeLTRB(0, y, bitmap->width(), bitmap->height());
     SkCanvas canvas(*bitmap);
-    canvas.clipRect(rect);
+    canvas.clipRect(SkRect::Make(rect));
     canvas.drawColor(SK_ColorWHITE);
 }