| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2012 Google Inc. | 2 * Copyright 2012 Google Inc. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license that can be | 4 * Use of this source code is governed by a BSD-style license that can be |
| 5 * found in the LICENSE file. | 5 * found in the LICENSE file. |
| 6 */ | 6 */ |
| 7 | 7 |
| 8 #include "SkBitmap.h" | 8 #include "SkBitmap.h" |
| 9 #include "SkCanvas.h" | 9 #include "SkCanvas.h" |
| 10 #include "SkData.h" | 10 #include "SkData.h" |
| 11 #include "SkImageGenerator.h" | 11 #include "SkImageGenerator.h" |
| 12 #include "SkImagePriv.h" | 12 #include "SkImagePriv.h" |
| 13 #include "SkImage_Base.h" | 13 #include "SkImage_Base.h" |
| 14 #include "SkNextID.h" | 14 #include "SkNextID.h" |
| 15 #include "SkPixelRef.h" | 15 #include "SkPixelRef.h" |
| 16 #include "SkPixelSerializer.h" |
| 16 #include "SkReadPixelsRec.h" | 17 #include "SkReadPixelsRec.h" |
| 17 #include "SkString.h" | 18 #include "SkString.h" |
| 18 #include "SkSurface.h" | 19 #include "SkSurface.h" |
| 19 | 20 |
| 20 #if SK_SUPPORT_GPU | 21 #if SK_SUPPORT_GPU |
| 21 #include "GrTexture.h" | 22 #include "GrTexture.h" |
| 22 #include "GrContext.h" | 23 #include "GrContext.h" |
| 23 #include "SkImage_Gpu.h" | 24 #include "SkImage_Gpu.h" |
| 24 #endif | 25 #endif |
| 25 | 26 |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 60 } | 61 } |
| 61 | 62 |
| 62 SkData* SkImage::encode(SkImageEncoder::Type type, int quality) const { | 63 SkData* SkImage::encode(SkImageEncoder::Type type, int quality) const { |
| 63 SkBitmap bm; | 64 SkBitmap bm; |
| 64 if (as_IB(this)->getROPixels(&bm)) { | 65 if (as_IB(this)->getROPixels(&bm)) { |
| 65 return SkImageEncoder::EncodeData(bm, type, quality); | 66 return SkImageEncoder::EncodeData(bm, type, quality); |
| 66 } | 67 } |
| 67 return nullptr; | 68 return nullptr; |
| 68 } | 69 } |
| 69 | 70 |
| 71 SkData* SkImage::encode(SkPixelSerializer* serializer) const { |
| 72 if (!serializer) { |
| 73 return this->encode(); |
| 74 } |
| 75 |
| 76 SkBitmap bm; |
| 77 SkAutoPixmapUnlock apu; |
| 78 if (as_IB(this)->getROPixels(&bm) && bm.requestLock(&apu)) { |
| 79 const SkPixmap& pmap = apu.pixmap(); |
| 80 return serializer->encodePixels(pmap.info(), pmap.addr(), pmap.rowBytes(
)); |
| 81 } |
| 82 |
| 83 return nullptr; |
| 84 } |
| 85 |
| 70 SkData* SkImage::refEncoded() const { | 86 SkData* SkImage::refEncoded() const { |
| 71 return as_IB(this)->onRefEncoded(); | 87 return as_IB(this)->onRefEncoded(); |
| 72 } | 88 } |
| 73 | 89 |
| 74 SkImage* SkImage::NewFromEncoded(SkData* encoded, const SkIRect* subset) { | 90 SkImage* SkImage::NewFromEncoded(SkData* encoded, const SkIRect* subset) { |
| 75 if (nullptr == encoded || 0 == encoded->size()) { | 91 if (nullptr == encoded || 0 == encoded->size()) { |
| 76 return nullptr; | 92 return nullptr; |
| 77 } | 93 } |
| 78 SkImageGenerator* generator = SkImageGenerator::NewFromEncoded(encoded); | 94 SkImageGenerator* generator = SkImageGenerator::NewFromEncoded(encoded); |
| 79 return generator ? SkImage::NewFromGenerator(generator, subset) : nullptr; | 95 return generator ? SkImage::NewFromGenerator(generator, subset) : nullptr; |
| (...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 302 | 318 |
| 303 SkImage* SkImage::NewFromAdoptedTexture(GrContext*, const GrBackendTextureDesc&,
SkAlphaType) { | 319 SkImage* SkImage::NewFromAdoptedTexture(GrContext*, const GrBackendTextureDesc&,
SkAlphaType) { |
| 304 return nullptr; | 320 return nullptr; |
| 305 } | 321 } |
| 306 | 322 |
| 307 SkImage* SkImage::NewFromTextureCopy(GrContext*, const GrBackendTextureDesc&, Sk
AlphaType) { | 323 SkImage* SkImage::NewFromTextureCopy(GrContext*, const GrBackendTextureDesc&, Sk
AlphaType) { |
| 308 return nullptr; | 324 return nullptr; |
| 309 } | 325 } |
| 310 | 326 |
| 311 #endif | 327 #endif |
| OLD | NEW |