diff options
author | 2011-05-04 00:20:09 +0000 | |
---|---|---|
committer | 2011-05-04 00:20:09 +0000 | |
commit | 68ac0dfce295df6a4f9e5c62a933b4c1d429410e (patch) | |
tree | 5a92afc03018e4279dadedc920115b4e73e0b8b9 /src/utils/SkUnitMappers.cpp | |
parent | 75595d939230506b5819f9ceed4a8b22a5661921 (diff) |
code style
git-svn-id: http://skia.googlecode.com/svn/trunk@1233 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/utils/SkUnitMappers.cpp')
-rw-r--r-- | src/utils/SkUnitMappers.cpp | 38 |
1 files changed, 13 insertions, 25 deletions
diff --git a/src/utils/SkUnitMappers.cpp b/src/utils/SkUnitMappers.cpp index 0363a2b8ae..2a4aaa7ec4 100644 --- a/src/utils/SkUnitMappers.cpp +++ b/src/utils/SkUnitMappers.cpp @@ -1,23 +1,19 @@ #include "SkUnitMappers.h" -SkDiscreteMapper::SkDiscreteMapper(int segments) -{ - if (segments < 2) - { +SkDiscreteMapper::SkDiscreteMapper(int segments) { + if (segments < 2) { fSegments = 0; fScale = 0; - } - else - { - if (segments > 0xFFFF) + } else { + if (segments > 0xFFFF) { segments = 0xFFFF; + } fSegments = segments; fScale = SK_Fract1 / (segments - 1); } } -uint16_t SkDiscreteMapper::mapUnit16(uint16_t input) -{ +uint16_t SkDiscreteMapper::mapUnit16(uint16_t input) { SkFixed x = input * fSegments >> 16; x = x * fScale >> 14; x += x << 15 >> 31; // map 0x10000 to 0xFFFF @@ -25,24 +21,20 @@ uint16_t SkDiscreteMapper::mapUnit16(uint16_t input) } SkDiscreteMapper::SkDiscreteMapper(SkFlattenableReadBuffer& rb) - : SkUnitMapper(rb) -{ + : SkUnitMapper(rb) { fSegments = rb.readU32(); fScale = rb.readU32(); } -SkFlattenable::Factory SkDiscreteMapper::getFactory() -{ +SkFlattenable::Factory SkDiscreteMapper::getFactory() { return Create; } -SkFlattenable* SkDiscreteMapper::Create(SkFlattenableReadBuffer& rb) -{ +SkFlattenable* SkDiscreteMapper::Create(SkFlattenableReadBuffer& rb) { return SkNEW_ARGS(SkDiscreteMapper, (rb)); } -void SkDiscreteMapper::flatten(SkFlattenableWriteBuffer& wb) -{ +void SkDiscreteMapper::flatten(SkFlattenableWriteBuffer& wb) { this->INHERITED::flatten(wb); wb.write32(fSegments); @@ -64,17 +56,13 @@ uint16_t SkCosineMapper::mapUnit16(uint16_t input) } SkCosineMapper::SkCosineMapper(SkFlattenableReadBuffer& rb) - : SkUnitMapper(rb) -{ -} + : SkUnitMapper(rb) {} -SkFlattenable::Factory SkCosineMapper::getFactory() -{ +SkFlattenable::Factory SkCosineMapper::getFactory() { return Create; } -SkFlattenable* SkCosineMapper::Create(SkFlattenableReadBuffer& rb) -{ +SkFlattenable* SkCosineMapper::Create(SkFlattenableReadBuffer& rb) { return SkNEW_ARGS(SkCosineMapper, (rb)); } |