| OLD | NEW |
| 1 #ifndef SkDeviceProperties_DEFINED | 1 #ifndef SkDeviceProperties_DEFINED |
| 2 #define SkDeviceProperties_DEFINED | 2 #define SkDeviceProperties_DEFINED |
| 3 | 3 |
| 4 #ifndef SK_GAMMA_EXPONENT | |
| 5 #define SK_GAMMA_EXPONENT (2.2f) | |
| 6 #endif | |
| 7 | |
| 8 #ifdef SK_GAMMA_SRGB | |
| 9 #undef SK_GAMMA_EXPONENT | |
| 10 #define SK_GAMMA_EXPONENT (0.0f) | |
| 11 #endif | |
| 12 | |
| 13 //TODO: get everyone to stop using SkFontLCDConfig::SetSubpixel* and remove this
import. | 4 //TODO: get everyone to stop using SkFontLCDConfig::SetSubpixel* and remove this
import. |
| 14 #include "SkFontLCDConfig.h" | 5 #include "SkFontLCDConfig.h" |
| 15 | 6 |
| 16 struct SkDeviceProperties { | 7 struct SkDeviceProperties { |
| 17 struct Geometry { | 8 struct Geometry { |
| 18 /** The orientation of the pixel specifies the interpretation of the | 9 /** The orientation of the pixel specifies the interpretation of the |
| 19 * layout. If the orientation is horizontal, the layout is interpreted a
s | 10 * layout. If the orientation is horizontal, the layout is interpreted a
s |
| 20 * left to right. It the orientation is vertical, the layout is | 11 * left to right. It the orientation is vertical, the layout is |
| 21 * interpreted top to bottom (rotated 90deg cw from horizontal). | 12 * interpreted top to bottom (rotated 90deg cw from horizontal). |
| 22 */ | 13 */ |
| (...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 103 | 94 |
| 104 /** Each pixel of an image will have some number of channels. | 95 /** Each pixel of an image will have some number of channels. |
| 105 * Can the layout of those channels be exploited? */ | 96 * Can the layout of those channels be exploited? */ |
| 106 Geometry fGeometry; | 97 Geometry fGeometry; |
| 107 | 98 |
| 108 /** Represents the color space of the image. This is a woefully inadequate b
eginning. */ | 99 /** Represents the color space of the image. This is a woefully inadequate b
eginning. */ |
| 109 SkScalar fGamma; | 100 SkScalar fGamma; |
| 110 }; | 101 }; |
| 111 | 102 |
| 112 #endif | 103 #endif |
| OLD | NEW |