Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(468)

Unified Diff: src/utils/ios/SkImageDecoder_iOS.mm

Issue 322403007: Fix a number of issues with iOS build. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Remove SKOSFile_iOS.mm a little more cleanly (and clearly) Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/gpu/gl/iOS/GrGLCreateNativeInterface_iOS.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/utils/ios/SkImageDecoder_iOS.mm
diff --git a/src/utils/ios/SkImageDecoder_iOS.mm b/src/utils/ios/SkImageDecoder_iOS.mm
index f347e060c885e75c5b51e4b809381aa4b725772a..5e4261ff1db08cd66e90e1d0dff76fda88be70a0 100755
--- a/src/utils/ios/SkImageDecoder_iOS.mm
+++ b/src/utils/ios/SkImageDecoder_iOS.mm
@@ -29,7 +29,8 @@ bool SkImageDecoder_iOS::onDecode(SkStream* stream, SkBitmap* bm, Mode mode) {
const int width = uimage.size.width;
const int height = uimage.size.height;
- bm->setConfig(SkBitmap::kARGB_8888_Config, width, height);
+ SkColorType ct = SkBitmapConfigToColorType(SkBitmap::kARGB_8888_Config);
+ bm->setInfo(SkImageInfo::Make(width, height, ct, kPremul_SkAlphaType), 0);
if (SkImageDecoder::kDecodeBounds_Mode == mode) {
return true;
}
« no previous file with comments | « src/gpu/gl/iOS/GrGLCreateNativeInterface_iOS.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698