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 "SkImage_Base.h" | 8 #include "SkImage_Base.h" |
9 #include "SkImagePriv.h" | 9 #include "SkImagePriv.h" |
10 #include "SkBitmap.h" | 10 #include "SkBitmap.h" |
11 #include "SkCanvas.h" | 11 #include "SkCanvas.h" |
12 #include "SkData.h" | 12 #include "SkData.h" |
13 #include "SkDecodingImageGenerator.h" | |
13 #include "SkMallocPixelRef.h" | 14 #include "SkMallocPixelRef.h" |
14 | 15 |
15 class SkImage_Raster : public SkImage_Base { | 16 class SkImage_Raster : public SkImage_Base { |
16 public: | 17 public: |
17 static bool ValidArgs(const Info& info, size_t rowBytes) { | 18 static bool ValidArgs(const Info& info, size_t rowBytes) { |
18 const int maxDimension = SK_MaxS32 >> 2; | 19 const int maxDimension = SK_MaxS32 >> 2; |
19 const size_t kMaxPixelByteSize = SK_MaxS32; | 20 const size_t kMaxPixelByteSize = SK_MaxS32; |
20 | 21 |
21 if (info.fWidth < 0 || info.fHeight < 0) { | 22 if (info.fWidth < 0 || info.fHeight < 0) { |
22 return false; | 23 return false; |
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
62 | 63 |
63 // exposed for SkSurface_Raster via SkNewImageFromPixelRef | 64 // exposed for SkSurface_Raster via SkNewImageFromPixelRef |
64 SkImage_Raster(const SkImageInfo&, SkPixelRef*, size_t rowBytes); | 65 SkImage_Raster(const SkImageInfo&, SkPixelRef*, size_t rowBytes); |
65 | 66 |
66 SkPixelRef* getPixelRef() const { return fBitmap.pixelRef(); } | 67 SkPixelRef* getPixelRef() const { return fBitmap.pixelRef(); } |
67 | 68 |
68 virtual SkShader* onNewShader(SkShader::TileMode, | 69 virtual SkShader* onNewShader(SkShader::TileMode, |
69 SkShader::TileMode, | 70 SkShader::TileMode, |
70 const SkMatrix* localMatrix) const SK_OVERRIDE ; | 71 const SkMatrix* localMatrix) const SK_OVERRIDE ; |
71 | 72 |
73 SkImage_Raster(const SkBitmap& bitmap) | |
74 :INHERITED(bitmap.width(), bitmap.height()) | |
reed1
2014/08/12 13:36:09
tiny nit: space after :
| |
75 , fBitmap(bitmap) { } | |
76 | |
72 private: | 77 private: |
73 SkImage_Raster() : INHERITED(0, 0) {} | 78 SkImage_Raster() : INHERITED(0, 0) {} |
74 | 79 |
75 SkBitmap fBitmap; | 80 SkBitmap fBitmap; |
76 | 81 |
77 typedef SkImage_Base INHERITED; | 82 typedef SkImage_Base INHERITED; |
78 }; | 83 }; |
79 | 84 |
80 /////////////////////////////////////////////////////////////////////////////// | 85 /////////////////////////////////////////////////////////////////////////////// |
81 | 86 |
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
199 } | 204 } |
200 | 205 |
201 SkImage* SkNewImageFromPixelRef(const SkImageInfo& info, SkPixelRef* pr, | 206 SkImage* SkNewImageFromPixelRef(const SkImageInfo& info, SkPixelRef* pr, |
202 size_t rowBytes) { | 207 size_t rowBytes) { |
203 return SkNEW_ARGS(SkImage_Raster, (info, pr, rowBytes)); | 208 return SkNEW_ARGS(SkImage_Raster, (info, pr, rowBytes)); |
204 } | 209 } |
205 | 210 |
206 SkPixelRef* SkBitmapImageGetPixelRef(SkImage* image) { | 211 SkPixelRef* SkBitmapImageGetPixelRef(SkImage* image) { |
207 return ((SkImage_Raster*)image)->getPixelRef(); | 212 return ((SkImage_Raster*)image)->getPixelRef(); |
208 } | 213 } |
214 | |
215 SkImage* SkImage::NewEncodedData(SkData* data) { | |
216 if (NULL == data) { | |
217 return NULL; | |
218 } | |
219 SkBitmap bitmap; | |
220 if (!SkInstallDiscardablePixelRef( | |
221 SkDecodingImageGenerator::Create( | |
222 data, SkDecodingImageGenerator::Options()), | |
223 &bitmap)) { | |
224 return NULL; | |
225 } | |
226 return SkNEW_ARGS(SkImage_Raster, (bitmap)); | |
227 } | |
OLD | NEW |