OLD | NEW |
1 | 1 |
2 /* | 2 /* |
3 * Copyright 2011 Google Inc. | 3 * Copyright 2011 Google Inc. |
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 #include "SkImageRef.h" | 8 #include "SkImageRef.h" |
9 #include "SkBitmap.h" | 9 #include "SkBitmap.h" |
10 #include "SkFlattenableBuffers.h" | 10 #include "SkFlattenableBuffers.h" |
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
136 } else { | 136 } else { |
137 SkDebugf("--- ImageRef: <%s> failed in codec for %d mode\n", | 137 SkDebugf("--- ImageRef: <%s> failed in codec for %d mode\n", |
138 this->getURI(), mode); | 138 this->getURI(), mode); |
139 } | 139 } |
140 #endif | 140 #endif |
141 fErrorInDecoding = true; | 141 fErrorInDecoding = true; |
142 fBitmap.reset(); | 142 fBitmap.reset(); |
143 return false; | 143 return false; |
144 } | 144 } |
145 | 145 |
146 void* SkImageRef::onLockPixels(SkColorTable** ct) { | 146 void* SkImageRef::onLockPixels(SkImageInfo* info, size_t* rowBytes, |
| 147 SkColorTable** ct) { |
147 if (NULL == fBitmap.getPixels()) { | 148 if (NULL == fBitmap.getPixels()) { |
148 (void)this->prepareBitmap(SkImageDecoder::kDecodePixels_Mode); | 149 (void)this->prepareBitmap(SkImageDecoder::kDecodePixels_Mode); |
149 } | 150 } |
150 | 151 |
| 152 if (info) { |
| 153 fBitmap.asImageInfo(info); |
| 154 } |
| 155 if (rowBytes) { |
| 156 *rowBytes = fBitmap.rowBytes(); |
| 157 } |
151 if (ct) { | 158 if (ct) { |
152 *ct = fBitmap.getColorTable(); | 159 *ct = fBitmap.getColorTable(); |
153 } | 160 } |
154 return fBitmap.getPixels(); | 161 return fBitmap.getPixels(); |
155 } | 162 } |
156 | 163 |
157 size_t SkImageRef::ramUsed() const { | 164 size_t SkImageRef::ramUsed() const { |
158 size_t size = 0; | 165 size_t size = 0; |
159 | 166 |
160 if (fBitmap.getPixels()) { | 167 if (fBitmap.getPixels()) { |
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
193 // now. | 200 // now. |
194 if (!fStream->rewind()) { | 201 if (!fStream->rewind()) { |
195 SkDEBUGF(("Failed to rewind SkImageRef stream!")); | 202 SkDEBUGF(("Failed to rewind SkImageRef stream!")); |
196 buffer.write32(0); | 203 buffer.write32(0); |
197 } else { | 204 } else { |
198 // FIXME: Handle getLength properly here. Perhaps this class should | 205 // FIXME: Handle getLength properly here. Perhaps this class should |
199 // take an SkStreamAsset. | 206 // take an SkStreamAsset. |
200 buffer.writeStream(fStream, fStream->getLength()); | 207 buffer.writeStream(fStream, fStream->getLength()); |
201 } | 208 } |
202 } | 209 } |
OLD | NEW |