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 #ifndef SkImage_DEFINED | 8 #ifndef SkImage_DEFINED |
9 #define SkImage_DEFINED | 9 #define SkImage_DEFINED |
10 | 10 |
(...skipping 23 matching lines...) Expand all Loading... |
34 * other means. | 34 * other means. |
35 */ | 35 */ |
36 class SK_API SkImage : public SkRefCnt { | 36 class SK_API SkImage : public SkRefCnt { |
37 public: | 37 public: |
38 SK_DECLARE_INST_COUNT(SkImage) | 38 SK_DECLARE_INST_COUNT(SkImage) |
39 | 39 |
40 #ifdef SK_SUPPORT_LEGACY_COLORTYPE | 40 #ifdef SK_SUPPORT_LEGACY_COLORTYPE |
41 typedef SkColorType ColorType; | 41 typedef SkColorType ColorType; |
42 | 42 |
43 static const SkColorType kAlpha_8_ColorType = kAlpha_8_SkColorType; | 43 static const SkColorType kAlpha_8_ColorType = kAlpha_8_SkColorType; |
| 44 static const SkColorType kARGB_4444_ColorType = kARGB_4444_SkColorType; |
44 static const SkColorType kRGB_565_ColorType = kRGB_565_SkColorType; | 45 static const SkColorType kRGB_565_ColorType = kRGB_565_SkColorType; |
45 static const SkColorType kRGBA_8888_ColorType = kRGBA_8888_SkColorType; | 46 static const SkColorType kRGBA_8888_ColorType = kRGBA_8888_SkColorType; |
46 static const SkColorType kBGRA_8888_ColorType = kBGRA_8888_SkColorType; | 47 static const SkColorType kBGRA_8888_ColorType = kBGRA_8888_SkColorType; |
47 static const SkColorType kPMColor_ColorType = kPMColor_SkColorType; | 48 static const SkColorType kPMColor_ColorType = kPMColor_SkColorType; |
48 static const SkColorType kLastEnum_ColorType = kLastEnum_SkColorType; | 49 static const SkColorType kLastEnum_ColorType = kLastEnum_SkColorType; |
49 #endif | 50 #endif |
50 | 51 |
51 #ifdef SK_SUPPORT_LEGACY_ALPHATYPE | 52 #ifdef SK_SUPPORT_LEGACY_ALPHATYPE |
52 typedef SkAlphaType AlphaType; | 53 typedef SkAlphaType AlphaType; |
53 | 54 |
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
119 const int fWidth; | 120 const int fWidth; |
120 const int fHeight; | 121 const int fHeight; |
121 const uint32_t fUniqueID; | 122 const uint32_t fUniqueID; |
122 | 123 |
123 static uint32_t NextUniqueID(); | 124 static uint32_t NextUniqueID(); |
124 | 125 |
125 typedef SkRefCnt INHERITED; | 126 typedef SkRefCnt INHERITED; |
126 }; | 127 }; |
127 | 128 |
128 #endif | 129 #endif |
OLD | NEW |