Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bee74c2b authored by John Reck's avatar John Reck Committed by Android (Google) Code Review
Browse files

Merge "Clamp to uint8 for alpha"

parents 19143744 531ee701
Loading
Loading
Loading
Loading
+6 −1
Original line number Original line Diff line number Diff line
@@ -199,13 +199,18 @@ float CanvasPropertyPaintAnimator::getValue() const {
    return -1;
    return -1;
}
}


static uint8_t to_uint8(float value) {
    int c = (int) (value + .5f);
    return static_cast<uint8_t>( c < 0 ? 0 : c > 255 ? 255 : c );
}

void CanvasPropertyPaintAnimator::setValue(float value) {
void CanvasPropertyPaintAnimator::setValue(float value) {
    switch (mField) {
    switch (mField) {
    case STROKE_WIDTH:
    case STROKE_WIDTH:
        mProperty->value.setStrokeWidth(value);
        mProperty->value.setStrokeWidth(value);
        return;
        return;
    case ALPHA:
    case ALPHA:
        mProperty->value.setAlpha(value);
        mProperty->value.setAlpha(to_uint8(value));
        return;
        return;
    }
    }
    LOG_ALWAYS_FATAL("Unknown field %d", (int) mField);
    LOG_ALWAYS_FATAL("Unknown field %d", (int) mField);