diff options
| author | 2016-04-25 20:09:51 -0400 | |
|---|---|---|
| committer | 2016-04-25 20:09:51 -0400 | |
| commit | 596678f2cd1b40c456db8f278a7f652c2a37da84 (patch) | |
| tree | a4ffbdf51889f7a63ea7dc3da3afee4535987030 /src/osd/modules/render/bgfx/clearreader.cpp | |
| parent | ec2669cacff2ec954ba351e09ba083c4e32b4ce4 (diff) | |
| parent | e8326cdc3267591b635f4f97e5255e031ba6b834 (diff) | |
Merge remote-tracking branch 'upstream/master' into firstrun
Diffstat (limited to 'src/osd/modules/render/bgfx/clearreader.cpp')
| -rw-r--r-- | src/osd/modules/render/bgfx/clearreader.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/osd/modules/render/bgfx/clearreader.cpp b/src/osd/modules/render/bgfx/clearreader.cpp index 78c3d139d25..3cbd714463c 100644 --- a/src/osd/modules/render/bgfx/clearreader.cpp +++ b/src/osd/modules/render/bgfx/clearreader.cpp @@ -30,10 +30,10 @@ clear_state* clear_reader::read_from_value(const Value& value, std::string prefi for (int i = 0; i < colors.Size(); i++) { if (!READER_CHECK(colors[i].IsNumber(), (prefix + "clearcolor[" + std::to_string(i) + "] must be a numeric value\n").c_str())) return nullptr; - int32_t value = int32_t(float(colors[i].GetDouble()) * 255.0f); - if (value > 255) value = 255; - if (value < 0) value = 0; - clear_color |= value << (24 - (i * 3)); + int32_t val = int32_t(float(colors[i].GetDouble()) * 255.0f); + if (val > 255) val = 255; + if (val < 0) val = 0; + clear_color |= val << (24 - (i * 3)); } clear_flags |= BGFX_CLEAR_COLOR; } |
