| 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 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 57 SkASSERT(SkBitmap::kNo_Config != fBitmap.config()); | 57 SkASSERT(SkBitmap::kNo_Config != fBitmap.config()); |
| 58 if (bitmap) { | 58 if (bitmap) { |
| 59 bitmap->setConfig(fBitmap.config(), fBitmap.width(), fBitmap.height()); | 59 bitmap->setConfig(fBitmap.config(), fBitmap.width(), fBitmap.height()); |
| 60 } | 60 } |
| 61 return true; | 61 return true; |
| 62 } | 62 } |
| 63 | 63 |
| 64 bool SkImageRef::isOpaque(SkBitmap* bitmap) { | 64 bool SkImageRef::isOpaque(SkBitmap* bitmap) { |
| 65 if (bitmap && bitmap->pixelRef() == this) { | 65 if (bitmap && bitmap->pixelRef() == this) { |
| 66 bitmap->lockPixels(); | 66 bitmap->lockPixels(); |
| 67 bitmap->setIsOpaque(fBitmap.isOpaque()); | 67 // what about colortables?????? |
| 68 bitmap->setAlphaType(fBitmap.alphaType()); |
| 68 bitmap->unlockPixels(); | 69 bitmap->unlockPixels(); |
| 69 return true; | 70 return true; |
| 70 } | 71 } |
| 71 return false; | 72 return false; |
| 72 } | 73 } |
| 73 | 74 |
| 74 SkImageDecoderFactory* SkImageRef::setDecoderFactory( | 75 SkImageDecoderFactory* SkImageRef::setDecoderFactory( |
| 75 SkImageDecoderFactory* fact) { | 76 SkImageDecoderFactory* fact) { |
| 76 SkRefCnt_SafeAssign(fFactory, fact); | 77 SkRefCnt_SafeAssign(fFactory, fact); |
| 77 return fact; | 78 return fact; |
| (...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 192 // now. | 193 // now. |
| 193 if (!fStream->rewind()) { | 194 if (!fStream->rewind()) { |
| 194 SkDEBUGF(("Failed to rewind SkImageRef stream!")); | 195 SkDEBUGF(("Failed to rewind SkImageRef stream!")); |
| 195 buffer.write32(0); | 196 buffer.write32(0); |
| 196 } else { | 197 } else { |
| 197 // FIXME: Handle getLength properly here. Perhaps this class should | 198 // FIXME: Handle getLength properly here. Perhaps this class should |
| 198 // take an SkStreamAsset. | 199 // take an SkStreamAsset. |
| 199 buffer.writeStream(fStream, fStream->getLength()); | 200 buffer.writeStream(fStream, fStream->getLength()); |
| 200 } | 201 } |
| 201 } | 202 } |
| OLD | NEW |