OLD | NEW |
1 | 1 |
2 /* | 2 /* |
3 * Copyright 2006 The Android Open Source Project | 3 * Copyright 2006 The Android Open Source Project |
4 * | 4 * |
5 * Use of this source code is governed by a BSD-style license that can be | 5 * Use of this source code is governed by a BSD-style license that can be |
6 * found in the LICENSE file. | 6 * found in the LICENSE file. |
7 */ | 7 */ |
8 | 8 |
9 | 9 |
10 #include "SkDrawBitmap.h" | 10 #include "SkDrawBitmap.h" |
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
81 case 4: formatName = "RGB32"; break; | 81 case 4: formatName = "RGB32"; break; |
82 } | 82 } |
83 SkDebugf("format=\"%s\" />\n", formatName); | 83 SkDebugf("format=\"%s\" />\n", formatName); |
84 } | 84 } |
85 #endif | 85 #endif |
86 | 86 |
87 void SkDrawBitmap::onEndElement(SkAnimateMaker&) { | 87 void SkDrawBitmap::onEndElement(SkAnimateMaker&) { |
88 SkASSERT(width != -1); | 88 SkASSERT(width != -1); |
89 SkASSERT(height != -1); | 89 SkASSERT(height != -1); |
90 SkASSERT(rowBytes >= 0); | 90 SkASSERT(rowBytes >= 0); |
91 fBitmap.setConfig((SkBitmap::Config) format, width, height, rowBytes); | 91 SkColorType colorType = SkBitmapConfigToColorType((SkBitmap::Config)format); |
| 92 fBitmap.setInfo(SkImageInfo::Make(width, height, colorType, kPremul_SkAlphaT
ype), rowBytes); |
92 fBitmap.allocPixels(); | 93 fBitmap.allocPixels(); |
93 if (fColorSet) | 94 if (fColorSet) |
94 fBitmap.eraseColor(fColor); | 95 fBitmap.eraseColor(fColor); |
95 } | 96 } |
96 | 97 |
97 bool SkDrawBitmap::setProperty(int index, SkScriptValue& value) | 98 bool SkDrawBitmap::setProperty(int index, SkScriptValue& value) |
98 { | 99 { |
99 switch (index) { | 100 switch (index) { |
100 case SK_PROPERTY(erase): | 101 case SK_PROPERTY(erase): |
101 SkASSERT(value.fType == SkType_ARGB); | 102 SkASSERT(value.fType == SkType_ARGB); |
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
187 fLast.set(src); | 188 fLast.set(src); |
188 fBitmap.reset(); | 189 fBitmap.reset(); |
189 | 190 |
190 //SkStream* stream = SkStream::GetURIStream(fUriBase, src.c_str()); | 191 //SkStream* stream = SkStream::GetURIStream(fUriBase, src.c_str()); |
191 SkAutoTUnref<SkStreamAsset> stream(SkStream::NewFromFile(src.c_str())); | 192 SkAutoTUnref<SkStreamAsset> stream(SkStream::NewFromFile(src.c_str())); |
192 if (stream.get()) { | 193 if (stream.get()) { |
193 SkImageDecoder::DecodeStream(stream, &fBitmap); | 194 SkImageDecoder::DecodeStream(stream, &fBitmap); |
194 } | 195 } |
195 } | 196 } |
196 } | 197 } |
OLD | NEW |