ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #222 from comex/more-clang-fixes 

More clang fixes
This commit is contained in:
Pierre Bourdon 2014-03-30 13:24:08 +02:00
parent b31d1fd313 92dd498fa7
commit 9b03178673
5 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/DolphinWX/ISOProperties.cpp
View File

@ -899,7 +899,7 @@ void CISOProperties::OnExtractDataFromHeader(wxCommandEvent& event)
if (DiscIO::IsVolumeWiiDisc(OpenISO)) if (DiscIO::IsVolumeWiiDisc(OpenISO))
{ {
wxString Directory = m_Treectrl->GetItemText(m_Treectrl->GetSelection()); wxString Directory = m_Treectrl->GetItemText(m_Treectrl->GetSelection());
int partitionNum = wxAtoi(Directory.Mid(Directory.find_first_of("0123456789"), 2)); unsigned int partitionNum = wxAtoi(Directory.Mid(Directory.find_first_of("0123456789"), 2));
if (WiiDisc.size() > partitionNum) if (WiiDisc.size() > partitionNum)
{ {

2
Source/Core/VideoBackends/OGL/RasterFont.cpp
View File

@ -213,7 +213,7 @@ void RasterFont::printMultilineText(const std::string& text, double start_x, dou
continue; continue;
} }
if (c < char_offset || c >= char_count+char_offset) if ((u32) c < char_offset || (u32) c >= char_count+char_offset)
continue; continue;
vertices[usage++] = x; vertices[usage++] = x;

2
Source/Core/VideoCommon/BPFunctions.cpp
View File

@ -161,7 +161,7 @@ void OnPixelFormatChange()
auto new_format = bpmem.zcontrol.pixel_format; auto new_format = bpmem.zcontrol.pixel_format;
// no need to reinterpret pixel data in these cases // no need to reinterpret pixel data in these cases
if (new_format == old_format || old_format == (unsigned int)-1) if (new_format == old_format || old_format == PEControl::INVALID_FMT)
goto skip; goto skip;
// Check for pixel format changes // Check for pixel format changes

17
Source/Core/VideoCommon/BPMemory.h
View File

@ -779,14 +779,15 @@ union PEControl
{ {
enum PixelFormat : u32 enum PixelFormat : u32
{ {
RGB8_Z24 = 0, RGB8_Z24 = 0,
RGBA6_Z24 = 1, RGBA6_Z24 = 1,
RGB565_Z16 = 2, RGB565_Z16 = 2,
Z24 = 3, Z24 = 3,
Y8 = 4, Y8 = 4,
U8 = 5, U8 = 5,
V8 = 6, V8 = 6,
YUV420 = 7 YUV420 = 7,
INVALID_FMT = 0xffffffff, // Used by Dolphin to represent a missing value.
}; };
enum DepthFormat : u32 enum DepthFormat : u32

4
Source/Core/VideoCommon/RenderBase.cpp
View File

@ -64,7 +64,7 @@ int Renderer::s_LastEFBScale;
bool Renderer::s_skipSwap; bool Renderer::s_skipSwap;
bool Renderer::XFBWrited; bool Renderer::XFBWrited;
PEControl::PixelFormat Renderer::prev_efb_format = (PEControl::PixelFormat)-1; PEControl::PixelFormat Renderer::prev_efb_format = PEControl::INVALID_FMT;
unsigned int Renderer::efb_scale_numeratorX = 1; unsigned int Renderer::efb_scale_numeratorX = 1;
unsigned int Renderer::efb_scale_numeratorY = 1; unsigned int Renderer::efb_scale_numeratorY = 1;
unsigned int Renderer::efb_scale_denominatorX = 1; unsigned int Renderer::efb_scale_denominatorX = 1;
@ -89,7 +89,7 @@ Renderer::Renderer()
Renderer::~Renderer() Renderer::~Renderer()
{ {
// invalidate previous efb format // invalidate previous efb format
prev_efb_format = (PEControl::PixelFormat)-1; prev_efb_format = PEControl::INVALID_FMT;
efb_scale_numeratorX = efb_scale_numeratorY = efb_scale_denominatorX = efb_scale_denominatorY = 1; efb_scale_numeratorX = efb_scale_numeratorY = efb_scale_denominatorX = efb_scale_denominatorY = 1;