Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / third_party / skia / src / ports / SkImageDecoder_CG.cpp

diff --git a/src/third_party/skia/src/ports/SkImageDecoder_CG.cpp b/src/third_party/skia/src/ports/SkImageDecoder_CG.cpp
index beb6ed1..90c282d 100644 (file)
--- a/src/third_party/skia/src/ports/SkImageDecoder_CG.cpp
+++ b/src/third_party/skia/src/ports/SkImageDecoder_CG.cpp
@@ -66,8 +66,8 @@ bool SkImageDecoder_CG::onDecode(SkStream* stream, SkBitmap* bm, Mode mode) {
     }
     SkAutoTCallVProc<CGImage, CGImageRelease> arimage(image);
 
-    const int width = CGImageGetWidth(image);
-    const int height = CGImageGetHeight(image);
+    const int width = SkToInt(CGImageGetWidth(image));
+    const int height = SkToInt(CGImageGetHeight(image));
     bm->setConfig(SkBitmap::kARGB_8888_Config, width, height);
     if (SkImageDecoder::kDecodeBounds_Mode == mode) {
         return true;