diff options
| author |  archshift | 2015-07-13 22:07:39 -0700 |
|---|---|---|
| committer | archshift | 2015-07-13 22:07:39 -0700 |
| commit | 2501f111a6a6ab1a660791061abe5b26b71e1be7 (patch) | |
| tree | 286a4616f6a4a344e963517f0c4968af9b0a453b | |
| parent | Fix uploading of builds by adding exec bit to .travis-upload.sh (diff) | |
| parent | Y2R: Fix narrowing warning (diff) | |
| download | yuzu-2501f111a6a6ab1a660791061abe5b26b71e1be7.tar.gz yuzu-2501f111a6a6ab1a660791061abe5b26b71e1be7.tar.xz yuzu-2501f111a6a6ab1a660791061abe5b26b71e1be7.zip | |
Merge pull request #904 from aroulin/y2r-narrowing-warning
Y2R: Fix narrowing warning
Diffstat (limited to '')
| -rw-r--r-- | src/core/hw/y2r.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/hw/y2r.cpp b/src/core/hw/y2r.cpp index b40f13cae..f80e26ecd 100644 --- a/src/core/hw/y2r.cpp +++ b/src/core/hw/y2r.cpp | |||
| @@ -111,7 +111,7 @@ static void SendData(const u32* input, ConversionBuffer& buf, int amount_of_data | |||
| 111 | while (output < unit_end) { | 111 | while (output < unit_end) { |
| 112 | u32 color = *input++; | 112 | u32 color = *input++; |
| 113 | Math::Vec4<u8> col_vec{ | 113 | Math::Vec4<u8> col_vec{ |
| 114 | (color >> 24) & 0xFF, (color >> 16) & 0xFF, (color >> 8) & 0xFF, alpha, | 114 | (u8)(color >> 24), (u8)(color >> 16), (u8)(color >> 8), alpha |
| 115 | }; | 115 | }; |
| 116 | 116 | ||
| 117 | switch (output_format) { | 117 | switch (output_format) { |