Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2024-11-23 06:15:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

CDImage: clang warning fix

Browse source
This commit is contained in:
Stenzek 2023-11-06 17:56:30 +10:00
parent 928d137111
commit c5cd55ffb1
No known key found for this signature in database
1 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/util/cd_image.cpp
View file

@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin <stenzek@gmail.com> // SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin <stenzek@gmail.com>
// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) // SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0)
#include "cd_image.h" #include "cd_image.h"
@ -28,23 +28,19 @@ void CDImage::DeinterleaveSubcode(const u8* subcode_in, u8* subcode_out)
{ {
std::memset(subcode_out, 0, ALL_SUBCODE_SIZE); std::memset(subcode_out, 0, ALL_SUBCODE_SIZE);
int row = 0; u32 row = 0;
for (int bitNum = 0; bitNum < 8; bitNum++) for (u32 bitNum = 0; bitNum < 8; bitNum++)
{ {
for (int nColumn = 0; nColumn < ALL_SUBCODE_SIZE; row++) for (u32 nColumn = 0; nColumn < ALL_SUBCODE_SIZE; row++)
{ {
u32 mask = 0x80; u32 mask = 0x80;
for (int nShift = 0; nShift < 8; nShift++, nColumn++) for (int nShift = 0; nShift < 8; nShift++, nColumn++)
{ {
const int n = nShift - bitNum; const s32 n = static_cast<s32>(nShift) - static_cast<s32>(bitNum);
if (n > 0) if (n > 0)
{
subcode_out[row] |= static_cast<u8>((subcode_in[nColumn] >> n) & mask); subcode_out[row] |= static_cast<u8>((subcode_in[nColumn] >> n) & mask);
}
else else
{
subcode_out[row] |= static_cast<u8>((subcode_in[nColumn] << std::abs(n)) & mask); subcode_out[row] |= static_cast<u8>((subcode_in[nColumn] << std::abs(n)) & mask);
}
mask >>= 1; mask >>= 1;
} }
} }