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" |
11 #include "SkImageDecoder.h" | 11 #include "SkImageDecoder.h" |
12 #include "SkStream.h" | 12 #include "SkStream.h" |
13 #include "SkTemplates.h" | 13 #include "SkTemplates.h" |
14 #include "SkThread.h" | 14 #include "SkThread.h" |
15 | 15 |
16 //#define DUMP_IMAGEREF_LIFECYCLE | 16 //#define DUMP_IMAGEREF_LIFECYCLE |
17 | 17 |
18 static SkImageInfo dummy_info() { | |
19 SkImageInfo info; | |
20 sk_bzero(&info, sizeof(info)); | |
21 return info; | |
22 } | |
18 | 23 |
19 /////////////////////////////////////////////////////////////////////////////// | 24 /////////////////////////////////////////////////////////////////////////////// |
20 | 25 |
21 SkImageRef::SkImageRef(SkStreamRewindable* stream, SkBitmap::Config config, | 26 SkImageRef::SkImageRef(SkStreamRewindable* stream, SkBitmap::Config config, |
22 int sampleSize, SkBaseMutex* mutex) | 27 int sampleSize, SkBaseMutex* mutex) |
23 : SkPixelRef(mutex), fErrorInDecoding(false) { | 28 : SkPixelRef(dummy_info(), mutex), fErrorInDecoding(false) { |
scroggo
2013/12/06 14:50:33
Could you mark with a fixme or todo?
reed1
2013/12/06 15:48:46
fixed
| |
24 SkASSERT(stream); | 29 SkASSERT(stream); |
25 stream->ref(); | 30 stream->ref(); |
26 fStream = stream; | 31 fStream = stream; |
27 fConfig = config; | 32 fConfig = config; |
28 fSampleSize = sampleSize; | 33 fSampleSize = sampleSize; |
29 fDoDither = true; | 34 fDoDither = true; |
30 fPrev = fNext = NULL; | 35 fPrev = fNext = NULL; |
31 fFactory = NULL; | 36 fFactory = NULL; |
32 | 37 |
33 #ifdef DUMP_IMAGEREF_LIFECYCLE | 38 #ifdef DUMP_IMAGEREF_LIFECYCLE |
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
136 } else { | 141 } else { |
137 SkDebugf("--- ImageRef: <%s> failed in codec for %d mode\n", | 142 SkDebugf("--- ImageRef: <%s> failed in codec for %d mode\n", |
138 this->getURI(), mode); | 143 this->getURI(), mode); |
139 } | 144 } |
140 #endif | 145 #endif |
141 fErrorInDecoding = true; | 146 fErrorInDecoding = true; |
142 fBitmap.reset(); | 147 fBitmap.reset(); |
143 return false; | 148 return false; |
144 } | 149 } |
145 | 150 |
146 void* SkImageRef::onLockPixels(SkColorTable** ct) { | 151 bool SkImageRef::onNewLockPixels(LockRec* rec) { |
147 if (NULL == fBitmap.getPixels()) { | 152 if (NULL == fBitmap.getPixels()) { |
148 (void)this->prepareBitmap(SkImageDecoder::kDecodePixels_Mode); | 153 (void)this->prepareBitmap(SkImageDecoder::kDecodePixels_Mode); |
149 } | 154 } |
150 | 155 |
151 if (ct) { | 156 if (NULL == fBitmap.getPixels()) { |
152 *ct = fBitmap.getColorTable(); | 157 return false; |
153 } | 158 } |
154 return fBitmap.getPixels(); | 159 rec->fPixels = fBitmap.getPixels(); |
160 rec->fColorTable = NULL; | |
161 rec->fRowBytes = fBitmap.rowBytes(); | |
162 return true; | |
155 } | 163 } |
156 | 164 |
157 size_t SkImageRef::ramUsed() const { | 165 size_t SkImageRef::ramUsed() const { |
158 size_t size = 0; | 166 size_t size = 0; |
159 | 167 |
160 if (fBitmap.getPixels()) { | 168 if (fBitmap.getPixels()) { |
161 size = fBitmap.getSize(); | 169 size = fBitmap.getSize(); |
162 if (fBitmap.getColorTable()) { | 170 if (fBitmap.getColorTable()) { |
163 size += fBitmap.getColorTable()->count() * sizeof(SkPMColor); | 171 size += fBitmap.getColorTable()->count() * sizeof(SkPMColor); |
164 } | 172 } |
(...skipping 28 matching lines...) Expand all Loading... | |
193 // now. | 201 // now. |
194 if (!fStream->rewind()) { | 202 if (!fStream->rewind()) { |
195 SkDEBUGF(("Failed to rewind SkImageRef stream!")); | 203 SkDEBUGF(("Failed to rewind SkImageRef stream!")); |
196 buffer.write32(0); | 204 buffer.write32(0); |
197 } else { | 205 } else { |
198 // FIXME: Handle getLength properly here. Perhaps this class should | 206 // FIXME: Handle getLength properly here. Perhaps this class should |
199 // take an SkStreamAsset. | 207 // take an SkStreamAsset. |
200 buffer.writeStream(fStream, fStream->getLength()); | 208 buffer.writeStream(fStream, fStream->getLength()); |
201 } | 209 } |
202 } | 210 } |
OLD | NEW |