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 "SkImageDecoder.h" | 10 #include "SkImageDecoder.h" |
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
112 int height = head.fHeight; | 112 int height = head.fHeight; |
113 | 113 |
114 decodedBitmap->setInfo(SkImageInfo::Make(width, height, | 114 decodedBitmap->setInfo(SkImageInfo::Make(width, height, |
115 kIndex_8_SkColorType, kOpaque_SkAlp
haType)); | 115 kIndex_8_SkColorType, kOpaque_SkAlp
haType)); |
116 | 116 |
117 if (SkImageDecoder::kDecodeBounds_Mode == mode) { | 117 if (SkImageDecoder::kDecodeBounds_Mode == mode) { |
118 return kSuccess; | 118 return kSuccess; |
119 } | 119 } |
120 | 120 |
121 const SkPMColor colors[] = { SK_ColorBLACK, SK_ColorWHITE }; | 121 const SkPMColor colors[] = { SK_ColorBLACK, SK_ColorWHITE }; |
122 SkColorTable* ct = SkNEW_ARGS(SkColorTable, (colors, 2)); | 122 SkColorTable* ct = new SkColorTable(colors, 2); |
123 SkAutoUnref aur(ct); | 123 SkAutoUnref aur(ct); |
124 | 124 |
125 if (!this->allocPixelRef(decodedBitmap, ct)) { | 125 if (!this->allocPixelRef(decodedBitmap, ct)) { |
126 return kFailure; | 126 return kFailure; |
127 } | 127 } |
128 | 128 |
129 SkAutoLockPixels alp(*decodedBitmap); | 129 SkAutoLockPixels alp(*decodedBitmap); |
130 | 130 |
131 uint8_t* dst = decodedBitmap->getAddr8(0, 0); | 131 uint8_t* dst = decodedBitmap->getAddr8(0, 0); |
132 // store the 1-bit valuess at the end of our pixels, so we won't stomp | 132 // store the 1-bit valuess at the end of our pixels, so we won't stomp |
(...skipping 16 matching lines...) Expand all Loading... |
149 } | 149 } |
150 | 150 |
151 /////////////////////////////////////////////////////////////////////////////// | 151 /////////////////////////////////////////////////////////////////////////////// |
152 DEFINE_DECODER_CREATOR(WBMPImageDecoder); | 152 DEFINE_DECODER_CREATOR(WBMPImageDecoder); |
153 /////////////////////////////////////////////////////////////////////////////// | 153 /////////////////////////////////////////////////////////////////////////////// |
154 | 154 |
155 static SkImageDecoder* sk_wbmp_dfactory(SkStreamRewindable* stream) { | 155 static SkImageDecoder* sk_wbmp_dfactory(SkStreamRewindable* stream) { |
156 wbmp_head head; | 156 wbmp_head head; |
157 | 157 |
158 if (head.init(stream)) { | 158 if (head.init(stream)) { |
159 return SkNEW(SkWBMPImageDecoder); | 159 return new SkWBMPImageDecoder; |
160 } | 160 } |
161 return NULL; | 161 return NULL; |
162 } | 162 } |
163 | 163 |
164 static SkImageDecoder::Format get_format_wbmp(SkStreamRewindable* stream) { | 164 static SkImageDecoder::Format get_format_wbmp(SkStreamRewindable* stream) { |
165 wbmp_head head; | 165 wbmp_head head; |
166 if (head.init(stream)) { | 166 if (head.init(stream)) { |
167 return SkImageDecoder::kWBMP_Format; | 167 return SkImageDecoder::kWBMP_Format; |
168 } | 168 } |
169 return SkImageDecoder::kUnknown_Format; | 169 return SkImageDecoder::kUnknown_Format; |
170 } | 170 } |
171 | 171 |
172 static SkImageDecoder_DecodeReg gDReg(sk_wbmp_dfactory); | 172 static SkImageDecoder_DecodeReg gDReg(sk_wbmp_dfactory); |
173 static SkImageDecoder_FormatReg gFormatReg(get_format_wbmp); | 173 static SkImageDecoder_FormatReg gFormatReg(get_format_wbmp); |
OLD | NEW |