OLD | NEW |
1 /* | 1 /* |
2 * Copyright 2008 The Android Open Source Project | 2 * Copyright 2008 The Android Open Source Project |
3 * | 3 * |
4 * Use of this source code is governed by a BSD-style license that can be | 4 * Use of this source code is governed by a BSD-style license that can be |
5 * found in the LICENSE file. | 5 * found in the LICENSE file. |
6 */ | 6 */ |
7 | 7 |
8 #include "SkCGUtils.h" | 8 #include "SkCGUtils.h" |
9 #include "SkColorPriv.h" | 9 #include "SkColorPriv.h" |
10 #include "SkImageDecoder.h" | 10 #include "SkImageDecoder.h" |
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
61 SkAutoTCallVProc<const void, CFRelease> arsrc(imageSrc); | 61 SkAutoTCallVProc<const void, CFRelease> arsrc(imageSrc); |
62 | 62 |
63 CGImageRef image = CGImageSourceCreateImageAtIndex(imageSrc, 0, NULL); | 63 CGImageRef image = CGImageSourceCreateImageAtIndex(imageSrc, 0, NULL); |
64 if (NULL == image) { | 64 if (NULL == image) { |
65 return false; | 65 return false; |
66 } | 66 } |
67 SkAutoTCallVProc<CGImage, CGImageRelease> arimage(image); | 67 SkAutoTCallVProc<CGImage, CGImageRelease> arimage(image); |
68 | 68 |
69 const int width = SkToInt(CGImageGetWidth(image)); | 69 const int width = SkToInt(CGImageGetWidth(image)); |
70 const int height = SkToInt(CGImageGetHeight(image)); | 70 const int height = SkToInt(CGImageGetHeight(image)); |
71 bm->setConfig(SkBitmap::kARGB_8888_Config, width, height); | 71 SkImageInfo skinfo = SkImageInfo::MakeN32Premul(width, height); |
| 72 |
| 73 bm->setConfig(skinfo); |
72 if (SkImageDecoder::kDecodeBounds_Mode == mode) { | 74 if (SkImageDecoder::kDecodeBounds_Mode == mode) { |
73 return true; | 75 return true; |
74 } | 76 } |
75 | 77 |
76 if (!this->allocPixelRef(bm, NULL)) { | 78 if (!this->allocPixelRef(bm, NULL)) { |
77 return false; | 79 return false; |
78 } | 80 } |
| 81 |
| 82 SkAutoLockPixels alp(*bm); |
79 | 83 |
80 bm->lockPixels(); | 84 if (!SkCopyPixelsFromCGImage(bm->info(), bm->rowBytes(), bm->getPixels(), im
age)) { |
81 bm->eraseColor(SK_ColorTRANSPARENT); | 85 return false; |
82 | 86 } |
83 CGColorSpaceRef cs = CGColorSpaceCreateDeviceRGB(); | |
84 CGContextRef cg = CGBitmapContextCreate(bm->getPixels(), width, height, 8, b
m->rowBytes(), cs, BITMAP_INFO); | |
85 CFRelease(cs); | |
86 | |
87 CGContextDrawImage(cg, CGRectMake(0, 0, width, height), image); | |
88 CGContextRelease(cg); | |
89 | 87 |
90 CGImageAlphaInfo info = CGImageGetAlphaInfo(image); | 88 CGImageAlphaInfo info = CGImageGetAlphaInfo(image); |
91 switch (info) { | 89 switch (info) { |
92 case kCGImageAlphaNone: | 90 case kCGImageAlphaNone: |
93 case kCGImageAlphaNoneSkipLast: | 91 case kCGImageAlphaNoneSkipLast: |
94 case kCGImageAlphaNoneSkipFirst: | 92 case kCGImageAlphaNoneSkipFirst: |
95 SkASSERT(SkBitmap::ComputeIsOpaque(*bm)); | 93 SkASSERT(SkBitmap::ComputeIsOpaque(*bm)); |
96 bm->setAlphaType(kOpaque_SkAlphaType); | 94 bm->setAlphaType(kOpaque_SkAlphaType); |
97 break; | 95 break; |
98 default: | 96 default: |
99 // we don't know if we're opaque or not, so compute it. | 97 // we don't know if we're opaque or not, so compute it. |
100 if (SkBitmap::ComputeIsOpaque(*bm)) { | 98 if (SkBitmap::ComputeIsOpaque(*bm)) { |
101 bm->setAlphaType(kOpaque_SkAlphaType); | 99 bm->setAlphaType(kOpaque_SkAlphaType); |
102 } | 100 } |
103 } | 101 } |
104 if (!bm->isOpaque() && this->getRequireUnpremultipliedColors()) { | 102 if (!bm->isOpaque() && this->getRequireUnpremultipliedColors()) { |
105 // CGBitmapContext does not support unpremultiplied, so the image has be
en premultiplied. | 103 // CGBitmapContext does not support unpremultiplied, so the image has be
en premultiplied. |
106 // Convert to unpremultiplied. | 104 // Convert to unpremultiplied. |
107 for (int i = 0; i < width; ++i) { | 105 for (int i = 0; i < width; ++i) { |
108 for (int j = 0; j < height; ++j) { | 106 for (int j = 0; j < height; ++j) { |
109 uint32_t* addr = bm->getAddr32(i, j); | 107 uint32_t* addr = bm->getAddr32(i, j); |
110 *addr = SkUnPreMultiply::UnPreMultiplyPreservingByteOrder(*addr)
; | 108 *addr = SkUnPreMultiply::UnPreMultiplyPreservingByteOrder(*addr)
; |
111 } | 109 } |
112 } | 110 } |
113 bm->setAlphaType(kUnpremul_SkAlphaType); | 111 bm->setAlphaType(kUnpremul_SkAlphaType); |
114 } | 112 } |
115 bm->unlockPixels(); | |
116 return true; | 113 return true; |
117 } | 114 } |
118 | 115 |
119 /////////////////////////////////////////////////////////////////////////////// | 116 /////////////////////////////////////////////////////////////////////////////// |
120 | 117 |
121 extern SkImageDecoder* image_decoder_from_stream(SkStreamRewindable*); | 118 extern SkImageDecoder* image_decoder_from_stream(SkStreamRewindable*); |
122 | 119 |
123 SkImageDecoder* SkImageDecoder::Factory(SkStreamRewindable* stream) { | 120 SkImageDecoder* SkImageDecoder::Factory(SkStreamRewindable* stream) { |
124 SkImageDecoder* decoder = image_decoder_from_stream(stream); | 121 SkImageDecoder* decoder = image_decoder_from_stream(stream); |
125 if (NULL == decoder) { | 122 if (NULL == decoder) { |
(...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
286 | 283 |
287 SkAutoTCallVProc<const void, CFRelease> arsrc(imageSrc); | 284 SkAutoTCallVProc<const void, CFRelease> arsrc(imageSrc); |
288 const CFStringRef name = CGImageSourceGetType(imageSrc); | 285 const CFStringRef name = CGImageSourceGetType(imageSrc); |
289 if (NULL == name) { | 286 if (NULL == name) { |
290 return SkImageDecoder::kUnknown_Format; | 287 return SkImageDecoder::kUnknown_Format; |
291 } | 288 } |
292 return UTType_to_Format(name); | 289 return UTType_to_Format(name); |
293 } | 290 } |
294 | 291 |
295 static SkImageDecoder_FormatReg gFormatReg(get_format_cg); | 292 static SkImageDecoder_FormatReg gFormatReg(get_format_cg); |
OLD | NEW |