Warning fixes

This commit is contained in:
Connor McLaughlin
2021-06-26 15:05:21 +10:00
parent 1a18e3ceb8
commit 06b009f361
10 changed files with 25 additions and 29 deletions

View File

@ -397,9 +397,9 @@ bool CDImage::GenerateSubChannelQ(SubChannelQ* subq, LBA lba)
void CDImage::GenerateSubChannelQ(SubChannelQ* subq, const Index& index, u32 index_offset)
{
subq->control_bits = index.control.bits;
subq->track_number_bcd =
(index.track_number <= m_tracks.size() ? BinaryToBCD(index.track_number) : index.track_number);
subq->index_number_bcd = BinaryToBCD(index.index_number);
subq->track_number_bcd = (index.track_number <= m_tracks.size() ? BinaryToBCD(static_cast<u8>(index.track_number)) :
static_cast<u8>(index.track_number));
subq->index_number_bcd = BinaryToBCD(static_cast<u8>(index.index_number));
Position relative_position;
if (index.is_pregap)

View File

@ -1,4 +1,4 @@
#ifdef _MSC_VER
#if defined(_MSC_VER) && !defined(_CRT_SECURE_NO_WARNINGS)
#define _CRT_SECURE_NO_WARNINGS
#endif

View File

@ -19,7 +19,7 @@ static constexpr std::array<u8, 256> ComputeECCFLUT()
for (u32 i = 0; i < 256; i++)
{
u32 j = (i << 1) ^ (i & 0x80 ? 0x11D : 0);
ecc_lut[i] = j;
ecc_lut[i] = static_cast<u8>(j);
}
return ecc_lut;
}
@ -30,7 +30,7 @@ static constexpr std::array<u8, 256> ComputeECCBLUT()
for (u32 i = 0; i < 256; i++)
{
u32 j = (i << 1) ^ (i & 0x80 ? 0x11D : 0);
ecc_lut[i ^ j] = i;
ecc_lut[i ^ j] = static_cast<u8>(i);
}
return ecc_lut;
}

View File

@ -90,7 +90,7 @@ bool GetImageHash(CDImage* image, Hash* out_hash,
for (u32 i = 1; i <= image->GetTrackCount(); i++)
{
progress_callback->SetProgressValue(i - 1);
if (!ReadTrack(image, i, &digest, progress_callback))
if (!ReadTrack(image, static_cast<u8>(i), &digest, progress_callback))
{
progress_callback->PopState();
return false;

View File

@ -13,7 +13,7 @@ Texture::Texture(ComPtr<ID3D11Texture2D> texture, ComPtr<ID3D11ShaderResourceVie
const D3D11_TEXTURE2D_DESC desc = GetDesc();
m_width = desc.Width;
m_height = desc.Height;
m_samples = desc.SampleDesc.Count;
m_samples = static_cast<u16>(desc.SampleDesc.Count);
}
Texture::~Texture()